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 001/114] 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 002/114] 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 003/114] 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 004/114] 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 005/114] 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 006/114] 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 007/114] 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 008/114] 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 009/114] 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 010/114] 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 011/114] 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 012/114] 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 013/114] 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 014/114] 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 015/114] 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 016/114] 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 017/114] 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 018/114] 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 019/114] 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 020/114] 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 021/114] 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 022/114] 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 023/114] 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 024/114] 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 025/114] 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 026/114] 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 027/114] 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 028/114] 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 029/114] 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 030/114] 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 031/114] 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 032/114] 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 033/114] 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 034/114] 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 035/114] 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 036/114] 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 037/114] 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 038/114] 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 039/114] 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 040/114] 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 041/114] 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 042/114] 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 043/114] 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 044/114] 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 045/114] 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 046/114] 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 047/114] 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 048/114] 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 049/114] 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 050/114] 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 051/114] 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 052/114] 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 053/114] 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 054/114] 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 055/114] 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 056/114] 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 057/114] 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 058/114] 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 059/114] 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 060/114] 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 061/114] 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 062/114] 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 063/114] 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 064/114] 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 065/114] 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 066/114] 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 067/114] 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 068/114] 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 069/114] 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 070/114] 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 071/114] 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 072/114] 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 073/114] 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 074/114] 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 075/114] 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 076/114] 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 077/114] 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 078/114] 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 079/114] 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 080/114] 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 081/114] 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 082/114] 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 083/114] 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 084/114] 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 085/114] 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 086/114] 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 087/114] 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 088/114] 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 089/114] 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 090/114] 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 091/114] 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 092/114] 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 093/114] 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 094/114] 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 095/114] 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 096/114] 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 097/114] 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 098/114] 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 099/114] 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 100/114] 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 101/114] 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 102/114] 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 103/114] 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 104/114] 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 105/114] 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 106/114] 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 107/114] 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 108/114] 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 109/114] 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 110/114] 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 111/114] 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 112/114] 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 113/114] 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 114/114] 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) {