diff --git a/.jcheck/conf b/.jcheck/conf
index 17552ee7361ab..617f3d95ed8e6 100644
--- a/.jcheck/conf
+++ b/.jcheck/conf
@@ -5,6 +5,7 @@ version=23
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
+warning=issuestitle
 
 [repository]
 tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)
diff --git a/make/Docs.gmk b/make/Docs.gmk
index 2977f6f66f9e1..192843de9cdec 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -681,28 +681,25 @@ ifeq ($(ENABLE_PANDOC), true)
       $(TOPDIR)/make/jdk/src/classes/build/tools/pandocfilter)
 
   $(foreach m, $(ALL_MODULES), \
-    $(eval MAN_$m := $(call FindModuleManDirs, $m)) \
-    $(foreach d, $(MAN_$m), \
-      $(foreach f, $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, $d))), \
-        $(eval $m_$f_NAME := MAN_TO_HTML_$m_$(strip $(call RelativePath, $f, $(TOPDIR)))) \
-        $(eval $(call SetupProcessMarkdown, $($m_$f_NAME), \
-            SRC := $d, \
-            FILES := $f, \
-            DEST := $(DOCS_OUTPUTDIR)/specs/man, \
-            FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \
-            CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
-            REPLACEMENTS := \
-		@@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
-		@@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
-		@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
-            OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
-            POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \
-                --nav-subdirs 1 --nav-link-guides, \
-            EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
-                $(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \
-        )) \
-        $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \
-      ) \
+    $(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
+          $(call FindModuleManDirs, $m))))) \
+    $(if $(MAN_$m), \
+      $(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
+        FILES := $(MAN_$m), \
+        DEST := $(DOCS_OUTPUTDIR)/specs/man, \
+        FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \
+        CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
+        REPLACEMENTS := \
+            @@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
+            @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
+            @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
+        OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
+        POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \
+            --nav-subdirs 1 --nav-link-guides, \
+        EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
+            $(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \
+      )) \
+      $(eval JDK_SPECS_TARGETS += $(MAN_TO_HTML_$m)) \
     ) \
   )
 
diff --git a/make/TestImage.gmk b/make/TestImage.gmk
index b719d6824da30..f6d680fb69073 100644
--- a/make/TestImage.gmk
+++ b/make/TestImage.gmk
@@ -28,6 +28,9 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, TestImage-pre.gmk))
+
 ############################################################################
 
 BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties
diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index acb815515a24d..c4a75fb89c39d 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -118,7 +118,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Setup LDFLAGS for linking executables
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined"
     # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
     # java heap.
     if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 8c91a2ccd33eb..23f331e79b7f9 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -190,6 +190,17 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(INCLUDE_SA)
 
+  # Setup default CDS alignment. On platforms where one build may run on machines with different
+  # page sizes, the JVM choses a compatible alignment to fit all possible page sizes. This slightly
+  # increases archive size.
+  # The only platform having this problem at the moment is Linux on aarch64, which may encounter
+  # three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K.
+  COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false
+  if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+    COMPATIBLE_CDS_ALIGNMENT_DEFAULT=true
+  fi
+  AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT)
+
   # Compress jars
   COMPRESS_JARS=false
 
@@ -673,7 +684,7 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
 #
 AC_DEFUN([JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT],
 [
-  UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: false,
+  UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: $COMPATIBLE_CDS_ALIGNMENT_DEFAULT,
       RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT,
       DESC: [enable use alternative compatible cds core region alignment],
       DEFAULT_DESC: [disabled],
diff --git a/make/common/ProcessMarkdown.gmk b/make/common/ProcessMarkdown.gmk
index e78c026a89c37..125892504f91a 100644
--- a/make/common/ProcessMarkdown.gmk
+++ b/make/common/ProcessMarkdown.gmk
@@ -38,48 +38,53 @@ define ProcessMarkdown
   $1_$2_INPUT_FILE := $3/$2
   $1_$2_MARKER := $$(subst /,_,$1_$2)
 
-  ifneq ($$($1_REPLACEMENTS), )
-    $1_$2_PANDOC_INPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_pre.tmp
-
-    $$(eval $$(call SetupTextFileProcessing, $1_$2_PREPROCESSED, \
-        SOURCE_FILES := $$($1_$2_INPUT_FILE), \
-        OUTPUT_FILE := $$($1_$2_PANDOC_INPUT), \
-        REPLACEMENTS := $$($1_REPLACEMENTS), \
-    ))
-  else
-    $1_$2_PANDOC_INPUT := $$($1_$2_INPUT_FILE)
-  endif
-
-  ifneq ($$($1_POST_PROCESS), )
-    $1_$2_PANDOC_OUTPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post.tmp
-  else
-    $1_$2_PANDOC_OUTPUT := $$($1_$2_OUTPUT_FILE)
-  endif
+  # Only continue if this target file hasn't been processed already. This lets
+  # the first found source file override any other with the same name.
+  ifeq ($$($1_$2_OUTPUT_FILE_PROCESSED), )
+    $1_$2_OUTPUT_FILE_PROCESSED := true
+
+    ifneq ($$($1_REPLACEMENTS), )
+      $1_$2_PANDOC_INPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_pre.tmp
+
+      $$(eval $$(call SetupTextFileProcessing, $1_$2_PREPROCESSED, \
+          SOURCE_FILES := $$($1_$2_INPUT_FILE), \
+          OUTPUT_FILE := $$($1_$2_PANDOC_INPUT), \
+          REPLACEMENTS := $$($1_REPLACEMENTS), \
+      ))
+    else
+      $1_$2_PANDOC_INPUT := $$($1_$2_INPUT_FILE)
+    endif
 
-  ifneq ($$($1_CSS), )
-    ifneq ($$(findstring https:/, $$($1_CSS)), )
-      $1_$2_CSS_OPTION := --css '$$($1_CSS)'
+    ifneq ($$($1_POST_PROCESS), )
+      $1_$2_PANDOC_OUTPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post.tmp
     else
-      $1_$2_CSS := $$(strip $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR)))
-      $1_$2_CSS_OPTION := --css '$$($1_$2_CSS)'
+      $1_$2_PANDOC_OUTPUT := $$($1_$2_OUTPUT_FILE)
     endif
-  endif
 
-  # This does not need to be included in VARDEPS since it's from the actual
-  # source file. Only run the shell if the recipe gets executed below.
-  $1_$2_OPTIONS_FROM_SRC = \
-      $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-)
+    ifneq ($$($1_CSS), )
+      ifneq ($$(findstring https:/, $$($1_CSS)), )
+        $1_$2_CSS_OPTION := --css '$$($1_CSS)'
+      else
+        $1_$2_CSS := $$(strip $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR)))
+        $1_$2_CSS_OPTION := --css '$$($1_$2_CSS)'
+      endif
+    endif
 
-  ifneq ($$($1_FILTER), )
-    $1_$2_OPTIONS := --filter $$($1_FILTER)
-  endif
+    # This does not need to be included in VARDEPS since it's from the actual
+    # source file. Only run the shell if the recipe gets executed below.
+    $1_$2_OPTIONS_FROM_SRC = \
+        $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-)
+
+    ifneq ($$($1_FILTER), )
+      $1_$2_OPTIONS := --filter $$($1_FILTER)
+    endif
 
-  $1_$2_VARDEPS := $$($1_OPTIONS) $$($1_$2_OPTIONS) $$($1_CSS) \
-      $$($1_REPLACEMENTS) $$($1_POST_PROCESS)
-  $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \
-      $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER).vardeps)
+    $1_$2_VARDEPS := $$($1_OPTIONS) $$($1_$2_OPTIONS) $$($1_CSS) \
+        $$($1_REPLACEMENTS) $$($1_POST_PROCESS)
+    $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \
+        $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER).vardeps)
 
-  $$($1_$2_PANDOC_OUTPUT): $$($1_$2_PANDOC_INPUT) $$($1_$2_VARDEPS_FILE) $$($1_EXTRA_DEPS)
+    $$($1_$2_PANDOC_OUTPUT): $$($1_$2_PANDOC_INPUT) $$($1_$2_VARDEPS_FILE) $$($1_EXTRA_DEPS)
 	$$(call LogInfo, Converting $2 to $$($1_FORMAT))
 	$$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$(dir $$($1_$2_PANDOC_OUTPUT)))
 	$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER), \
@@ -96,17 +101,18 @@ define ProcessMarkdown
 	  fi
         endif
 
-  # If we have no post processing, PANDOC_OUTPUT is set to OUTPUT_FILE. Otherwise
-  # PANDOC_OUTPUT is a temporary file, and we must now create the real OUTPUT_FILE.
-  ifneq ($$($1_POST_PROCESS), )
-    $$($1_$2_OUTPUT_FILE): $$($1_$2_PANDOC_OUTPUT)
+    # If we have no post processing, PANDOC_OUTPUT is set to OUTPUT_FILE. Otherwise
+    # PANDOC_OUTPUT is a temporary file, and we must now create the real OUTPUT_FILE.
+    ifneq ($$($1_POST_PROCESS), )
+      $$($1_$2_OUTPUT_FILE): $$($1_$2_PANDOC_OUTPUT)
 	$$(call LogInfo, Post-processing markdown file $2)
 	$$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$($1_$2_TARGET_DIR))
 	$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post, \
 	    ( $$($1_POST_PROCESS) $$($1_$2_PANDOC_OUTPUT) > $$($1_$2_OUTPUT_FILE) ) )
-  endif
+    endif
 
-  $1 += $$($1_$2_OUTPUT_FILE)
+    $1 += $$($1_$2_OUTPUT_FILE)
+  endif
 endef
 
 ################################################################################
diff --git a/make/conf/module-loader-map.conf b/make/conf/module-loader-map.conf
index 5b72bf78aa013..e904031186dee 100644
--- a/make/conf/module-loader-map.conf
+++ b/make/conf/module-loader-map.conf
@@ -120,6 +120,7 @@ NATIVE_ACCESS_MODULES= \
     jdk.dynalink \
     jdk.httpserver \
     jdk.incubator.vector \
+    jdk.internal.le \
     jdk.internal.vm.ci \
     jdk.jfr \
     jdk.jsobject \
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index 8d39ef4c1d55b..15251358a01a1 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -87,6 +87,7 @@ public class CLDRConverter {
     static final String ZONE_NAME_PREFIX = "timezone.displayname.";
     static final String METAZONE_ID_PREFIX = "metazone.id.";
     static final String PARENT_LOCALE_PREFIX = "parentLocale.";
+    static final String LIKELY_SCRIPT_PREFIX = "likelyScript.";
     static final String META_EMPTY_ZONE_NAME = "EMPTY_ZONE";
     static final String[] EMPTY_ZONE = {"", "", "", "", "", ""};
     static final String META_ETCUTC_ZONE_NAME = "ETC_UTC";
@@ -114,9 +115,13 @@ public class CLDRConverter {
 
     // "parentLocales" map
     private static final Map<String, SortedSet<String>> parentLocalesMap = new HashMap<>();
+    static boolean nonlikelyScript;
     private static final ResourceBundle.Control defCon =
         ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT);
 
+    // "likelyScript" map
+    private static final Map<String, SortedSet<String>> likelyScriptMap = new HashMap<>();
+
     private static Set<String> AVAILABLE_TZIDS;
     static int copyrightYear;
     static String jdkHeaderTemplate;
@@ -175,7 +180,7 @@ String getKeyword() {
     private static boolean verbose;
 
     private CLDRConverter() {
-       // no instantiation
+        // no instantiation
     }
 
     @SuppressWarnings("AssignmentToForLoopParameter")
@@ -475,8 +480,8 @@ private static void parseSupplemental() throws Exception {
         parseLDMLFile(new File(SPPL_SOURCE_FILE), handlerSuppl);
         Map<String, Object> parentData = handlerSuppl.getData("root");
         parentData.keySet().stream()
-                .filter(key -> key.startsWith(PARENT_LOCALE_PREFIX))
-                .forEach(key -> {
+            .filter(key -> key.startsWith(PARENT_LOCALE_PREFIX))
+            .forEach(key -> {
                 parentLocalesMap.put(key, new TreeSet<String>(
                     Arrays.asList(((String)parentData.get(key)).split(" "))));
             });
@@ -492,6 +497,16 @@ private static void parseSupplemental() throws Exception {
         // Parse likelySubtags
         handlerLikelySubtags = new LikelySubtagsParseHandler();
         parseLDMLFile(new File(LIKELYSUBTAGS_SOURCE_FILE), handlerLikelySubtags);
+        handlerLikelySubtags.getData().forEach((from, to) -> {
+            if (!from.contains("-")) { // look for language-only tag
+                var script = to.split("-")[1];
+                var key = LIKELY_SCRIPT_PREFIX + script;
+                var prev = likelyScriptMap.putIfAbsent(key, new TreeSet<String>(Set.of(from)));
+                if (prev != null) {
+                    prev.add(from);
+                }
+            }
+        });
 
         // Parse supplementalMetadata
         // Currently interested in deprecated time zone ids and language aliases.
@@ -561,6 +576,7 @@ private static void convertBundles(List<Bundle> bundles) throws Exception {
         // for now.
         if (isBaseModule) {
             metaInfo.putAll(parentLocalesMap);
+            metaInfo.putAll(likelyScriptMap);
         }
 
         for (Bundle bundle : bundles) {
@@ -1135,7 +1151,7 @@ private static List<Locale> applyParentLocales(String baseName, List<Locale> can
         // check irregular parents
         for (int i = 0; i < candidates.size(); i++) {
             Locale l = candidates.get(i);
-            Locale p = childToParentLocaleMap.get(l);
+            Locale p = getParentLocale(l);
             if (!l.equals(Locale.ROOT) &&
                 Objects.nonNull(p) &&
                 !candidates.get(i+1).equals(p)) {
@@ -1152,6 +1168,27 @@ private static List<Locale> applyParentLocales(String baseName, List<Locale> can
         return candidates;
     }
 
+    private static Locale getParentLocale(Locale child) {
+        Locale parent = childToParentLocaleMap.get(child);
+
+        // check non-likely script for root
+        if (nonlikelyScript && parent == null && child.getCountry().isEmpty()) {
+            var lang = " " + child.getLanguage() + " ";
+            var script = child.getScript();
+
+            if (!script.isEmpty()) {
+                parent = likelyScriptMap.entrySet().stream()
+                    .filter(e -> e.getValue().contains(lang))
+                    .findAny()
+                    .map(Map.Entry::getKey)
+                    .map(likely -> likely.equals(script) ? null : Locale.ROOT)
+                    .orElse(null);
+            }
+        }
+
+        return parent;
+    }
+
     private static void generateZoneName() throws Exception {
         Files.createDirectories(Paths.get(DESTINATION_DIR, "java", "time", "format"));
         Files.write(Paths.get(DESTINATION_DIR, "java", "time", "format", "ZoneName.java"),
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java b/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
index 49c74544be66e..3953f38f653e6 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -38,6 +38,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
+import java.util.stream.Collectors;
 
 class ResourceBundleGenerator implements BundleGenerator {
     // preferred timezones - keeping compatibility with JDK1.1 3 letter abbreviations
@@ -306,81 +307,77 @@ public void generateMetaInfo(Map<String, SortedSet<String>> metaInfo) throws IOE
                 import sun.util.locale.provider.LocaleProviderAdapter;
 
                 public class %s implements LocaleDataMetaInfo {
-                    private static final Map<String, String> resourceNameToLocales = HashMap.newHashMap(%d);
-                %s
-                    static {
-                """, CLDRConverter.isBaseModule ? "cldr" : "resources.cldr.provider",
-                className, metaInfo.keySet().stream().filter(k -> k.equals("AvailableLocales")).count(),
-                CLDRConverter.isBaseModule ?
-                    """
+                """,
+                    CLDRConverter.isBaseModule ? "cldr" : "resources.cldr.provider",
+                    className);
+
+            if (CLDRConverter.isBaseModule) {
+                out.printf("""
                         private static final Map<Locale, String[]> parentLocalesMap = HashMap.newHashMap(%d);
                         private static final Map<String, String> languageAliasMap = HashMap.newHashMap(%d);
+                        static final boolean nonlikelyScript = %s; // package access from CLDRLocaleProviderAdapter
+
+                        static {
                     """.formatted(
                         metaInfo.keySet().stream().filter(k -> k.startsWith(CLDRConverter.PARENT_LOCALE_PREFIX)).count(),
-                        CLDRConverter.handlerSupplMeta.getLanguageAliasData().size()) :
-                    "");
-
-            for (String key : metaInfo.keySet()) {
-                if (key.startsWith(CLDRConverter.PARENT_LOCALE_PREFIX)) {
-                    String parentTag = key.substring(CLDRConverter.PARENT_LOCALE_PREFIX.length());
-                    if ("root".equals(parentTag)) {
-                        out.printf("        parentLocalesMap.put(Locale.ROOT,\n");
-                    } else {
-                        out.printf("        parentLocalesMap.put(Locale.forLanguageTag(\"%s\"),\n",
-                                   parentTag);
-                    }
-                    String[] children = toLocaleList(metaInfo.get(key), true).split(" ");
-                    Arrays.sort(children);
-                    out.printf("            new String[] {\n" +
-                               "                ");
-                    int count = 0;
-                    for (int i = 0; i < children.length; i++) {
-                        String child = children[i];
-                        out.printf("\"%s\", ", child);
-                        count += child.length() + 4;
-                        if (i != children.length - 1 && count > 64) {
-                            out.printf("\n                ");
-                            count = 0;
+                        CLDRConverter.handlerSupplMeta.getLanguageAliasData().size(),
+                        Boolean.valueOf(CLDRConverter.nonlikelyScript)));
+
+                for (String key : metaInfo.keySet()) {
+                    if (key.startsWith(CLDRConverter.PARENT_LOCALE_PREFIX)) {
+                        String parentTag = key.substring(CLDRConverter.PARENT_LOCALE_PREFIX.length());
+                        if ("root".equals(parentTag)) {
+                            out.printf("        parentLocalesMap.put(Locale.ROOT,\n");
+                        } else {
+                            out.printf("        parentLocalesMap.put(Locale.forLanguageTag(\"%s\"),\n",
+                                    parentTag);
                         }
-                    }
-                    out.printf("\n            });\n");
-                } else {
-                    if ("AvailableLocales".equals(key)) {
-                        out.printf("        resourceNameToLocales.put(\"%s\",\n", key);
-                        out.printf("            \"%s\");\n", toLocaleList(applyLanguageAliases(metaInfo.get(key)), false));
+                        generateStringArray(metaInfo.get(key), out);
                     }
                 }
-            }
-            // for languageAliasMap
-            if (CLDRConverter.isBaseModule) {
+                out.println();
+
+                // for languageAliasMap
                 CLDRConverter.handlerSupplMeta.getLanguageAliasData().forEach((key, value) -> {
                     out.printf("        languageAliasMap.put(\"%s\", \"%s\");\n", key, value);
                 });
-            }
+                out.printf("    }\n\n");
 
-            out.printf("    }\n\n");
+                // end of static initializer block.
 
-            // end of static initializer block.
-
-            // Canonical TZ names for delayed initialization
-            if (CLDRConverter.isBaseModule) {
+                // Delayed initialization section
                 out.printf("""
-                               private static class TZCanonicalIDMapHolder {
-                                   static final Map<String, String> tzCanonicalIDMap = HashMap.newHashMap(%d);
+                               private static class CLDRMapHolder {
+                                   private static final Map<String, String> tzCanonicalIDMap = HashMap.newHashMap(%d);
+                                   private static final Map<String, String> likelyScriptMap = HashMap.newHashMap(%d);
+
                                    static {
-                           """, CLDRConverter.handlerTimeZone.getData().size());
+                           """, CLDRConverter.handlerTimeZone.getData().size(),
+                                metaInfo.keySet().stream().filter(k -> k.startsWith(CLDRConverter.LIKELY_SCRIPT_PREFIX)).count());
                 CLDRConverter.handlerTimeZone.getData().entrySet().stream()
                     .forEach(e -> {
                         String[] ids = ((String)e.getValue()).split("\\s");
                         out.printf("            tzCanonicalIDMap.put(\"%s\", \"%s\");\n", e.getKey(),
-                                ids[0]);
+                            ids[0]);
                         for (int i = 1; i < ids.length; i++) {
                             out.printf("            tzCanonicalIDMap.put(\"%s\", \"%s\");\n", ids[i],
                                 ids[0]);
                         }
                     });
-                out.printf("        }\n    }\n\n");
+                out.println();
+
+                // for likelyScript map
+                for (String key : metaInfo.keySet()) {
+                    if (key.startsWith(CLDRConverter.LIKELY_SCRIPT_PREFIX)) {
+                        // ensure spaces at the begin/end for delimiting purposes
+                        out.printf("            likelyScriptMap.put(\"%s\", \"%s\");\n",
+                                key.substring(CLDRConverter.LIKELY_SCRIPT_PREFIX.length()),
+                                " " + metaInfo.get(key).stream().collect(Collectors.joining(" ")) + " ");
+                    }
+                }
+                out.printf("        }\n    }\n");
             }
+            out.println();
 
             out.printf("""
                     @Override
@@ -390,12 +387,13 @@ public LocaleProviderAdapter.Type getType() {
 
                     @Override
                     public String availableLanguageTags(String category) {
-                        return resourceNameToLocales.getOrDefault(category, "");
+                        return " %s";
                     }
-                    %s
-                }
                 """,
-                CLDRConverter.isBaseModule ? """
+                toLocaleList(applyLanguageAliases(metaInfo.get("AvailableLocales")), false));
+
+            if(CLDRConverter.isBaseModule) {
+                out.printf("""
 
                     @Override
                     public Map<String, String> getLanguageAliasMap() {
@@ -404,16 +402,41 @@ public Map<String, String> getLanguageAliasMap() {
 
                     @Override
                     public Map<String, String> tzCanonicalIDs() {
-                        return TZCanonicalIDMapHolder.tzCanonicalIDMap;
+                        return CLDRMapHolder.tzCanonicalIDMap;
                     }
 
                     public Map<Locale, String[]> parentLocales() {
                         return parentLocalesMap;
                     }
-                """ : "");
+
+                    // package access from CLDRLocaleProviderAdapter
+                    Map<String, String> likelyScriptMap() {
+                        return CLDRMapHolder.likelyScriptMap;
+                    }
+                """);
+            }
+            out.printf("}\n");
         }
     }
 
+    private static void generateStringArray(SortedSet<String> set, PrintWriter out) throws IOException {
+        String[] children = toLocaleList(set, true).split(" ");
+        Arrays.sort(children);
+        out.printf("            new String[] {\n" +
+                "                ");
+        int count = 0;
+        for (int i = 0; i < children.length; i++) {
+            String child = children[i];
+            out.printf("\"%s\", ", child);
+            count += child.length() + 4;
+            if (i != children.length - 1 && count > 64) {
+                out.printf("\n                ");
+                count = 0;
+            }
+        }
+        out.printf("\n            });\n");
+    }
+
     private static final Locale.Builder LOCALE_BUILDER = new Locale.Builder();
     private static boolean isBaseLocale(String localeID) {
         localeID = localeID.replaceAll("-", "_");
@@ -433,7 +456,9 @@ private static String toLocaleList(SortedSet<String> set, boolean all) {
                 if (!all && CLDRConverter.isBaseModule ^ isBaseLocale(id)) {
                     continue;
                 }
-                sb.append(' ');
+                if (sb.length() > 0) {
+                    sb.append(' ');
+                }
                 sb.append(id);
             }
         }
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/SupplementalDataParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalDataParseHandler.java
index f4d20160ffb3b..9ba4d64519949 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/SupplementalDataParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalDataParseHandler.java
@@ -57,29 +57,22 @@ class SupplementalDataParseHandler extends AbstractLDMLHandler<Object> {
     // the weekData is listed using country code.
     //
     // weekData are generated per each country
-    private final Map<String, Object> firstDayMap;
-    private final Map<String, Object> minDaysMap;
+    private static final Map<String, Object> firstDayMap = new HashMap<>();
+    private static final Map<String, Object> minDaysMap = new HashMap<>();
 
     // Parent locales. These information will only be
     // generated towards the base meta info, with the format of
     //
     // parentLocale.<parent_locale_id>=<child_locale_id>(" "<child_locale_id>)+
-    private final Map<String, String> parentLocalesMap;
+    private static final Map<String, String> parentLocalesMap = new HashMap<>();
 
     // Input Skeleton map for "preferred" and "allowed"
     // Map<"preferred"/"allowed", Map<"skeleton", SortedSet<"regions">>>
-    private final Map<String, Map<String, SortedSet<String>>> inputSkeletonMap;
+    private static final Map<String, Map<String, SortedSet<String>>> inputSkeletonMap = new HashMap<>();
 
     // "component" specific to this parent locale chain
     private String currentParentLocaleComponent;
 
-    SupplementalDataParseHandler() {
-        firstDayMap = new HashMap<>();
-        minDaysMap = new HashMap<>();
-        parentLocalesMap = new HashMap<>();
-        inputSkeletonMap = new HashMap<>();
-    }
-
     /**
      * It returns Map that contains the firstDay and minDays information for
      * the country. The Map is created in JRE format after obtaining the data
@@ -158,9 +151,15 @@ public void startElement(String uri, String localName, String qName, Attributes
                 // Ignore component for now, otherwise "zh-Hant" falling back to "zh" would happen
                 // https://github.com/unicode-org/cldr/pull/2664
                 if (currentParentLocaleComponent == null) {
+                    var parent = attributes.getValue("parent").replaceAll("_", "-");
+
                     parentLocalesMap.put(
-                        attributes.getValue("parent").replaceAll("_", "-"),
+                        parent,
                         attributes.getValue("locales").replaceAll("_", "-"));
+
+                    if ("root".equals(parent)) {
+                        CLDRConverter.nonlikelyScript = "nonlikelyScript".equals(attributes.getValue("localeRules"));
+                    }
                 }
             }
             break;
diff --git a/make/modules/jdk.httpserver/Java.gmk b/make/modules/jdk.httpserver/Java.gmk
index d7b2b2f70ca21..799ff8695a74c 100644
--- a/make/modules/jdk.httpserver/Java.gmk
+++ b/make/modules/jdk.httpserver/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -24,3 +24,5 @@
 #
 
 DISABLED_WARNINGS_java += missing-explicit-ctor this-escape
+
+COPY += .ico
diff --git a/make/modules/jdk.internal.le/Lib.gmk b/make/modules/jdk.internal.le/Lib.gmk
deleted file mode 100644
index e81137e0d5387..0000000000000
--- a/make/modules/jdk.internal.le/Lib.gmk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include LibCommon.gmk
-
-ifeq ($(call isTargetOs, aix), false)
-  ##############################################################################
-  ## Build lible
-  ##############################################################################
-
-  $(eval $(call SetupJdkLibrary, BUILD_LIBLE, \
-      NAME := le, \
-      LINK_TYPE := C++, \
-      OPTIMIZATION := LOW, \
-      EXTRA_HEADER_DIRS := \
-          java.base:libjava \
-          java.base:libjvm, \
-      LD_SET_ORIGIN := false, \
-      LIBS_windows := user32.lib, \
-  ))
-
-  TARGETS += $(BUILD_LIBLE)
-endif
diff --git a/src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp
index 6204f21270374..a9c53da3d0186 100644
--- a/src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp
@@ -142,9 +142,11 @@
 //  * 63-48 Fixed (16-bits, always zero)
 //
 
-// Default value if probing is not implemented for a certain platform: 128TB
-static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
-// Minimum value returned, if probing fails: 64GB
+// Default value if probing is not implemented for a certain platform
+// Max address bit is restricted by implicit assumptions in the code, for instance
+// the bit layout of XForwardingEntry or Partial array entry (see XMarkStackEntry) in mark stack
+static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
+// Minimum value returned, if probing fails
 static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
 
 static size_t probe_valid_max_address_bit() {
diff --git a/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
index 6c3cea73d1a79..e140525bcbc5f 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
@@ -36,9 +36,11 @@
 #include <sys/mman.h>
 #endif // LINUX
 
-// Default value if probing is not implemented for a certain platform: 128TB
-static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
-// Minimum value returned, if probing fails: 64GB
+// Default value if probing is not implemented for a certain platform
+// Max address bit is restricted by implicit assumptions in the code, for instance
+// the bit layout of XForwardingEntry or Partial array entry (see XMarkStackEntry) in mark stack
+static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
+// Minimum value returned, if probing fail
 static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
 
 static size_t probe_valid_max_address_bit() {
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index b90b5862ee50e..faba321afc7f3 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -5535,12 +5535,22 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
   Label DONE, SAME;
   Register tmp1 = rscratch1;
   Register tmp2 = rscratch2;
-  Register cnt2 = tmp2;  // cnt2 only used in array length compare
   int elem_per_word = wordSize/elem_size;
   int log_elem_size = exact_log2(elem_size);
+  int klass_offset  = arrayOopDesc::klass_offset_in_bytes();
   int length_offset = arrayOopDesc::length_offset_in_bytes();
   int base_offset
     = arrayOopDesc::base_offset_in_bytes(elem_size == 2 ? T_CHAR : T_BYTE);
+  // When the length offset is not aligned to 8 bytes,
+  // then we align it down. This is valid because the new
+  // offset will always be the klass which is the same
+  // for type arrays.
+  int start_offset = align_down(length_offset, BytesPerWord);
+  int extra_length = base_offset - start_offset;
+  assert(start_offset == length_offset || start_offset == klass_offset,
+         "start offset must be 8-byte-aligned or be the klass offset");
+  assert(base_offset != start_offset, "must include the length field");
+  extra_length = extra_length / elem_size; // We count in elements, not bytes.
   int stubBytesThreshold = 3 * 64 + (UseSIMDForArrayEquals ? 0 : 16);
 
   assert(elem_size == 1 || elem_size == 2, "must be char or byte");
@@ -5574,11 +5584,10 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     //      return false;
     bind(A_IS_NOT_NULL);
     ldrw(cnt1, Address(a1, length_offset));
-    ldrw(cnt2, Address(a2, length_offset));
-    eorw(tmp5, cnt1, cnt2);
-    cbnzw(tmp5, DONE);
-    lea(a1, Address(a1, base_offset));
-    lea(a2, Address(a2, base_offset));
+    // Increase loop counter by diff between base- and actual start-offset.
+    addw(cnt1, cnt1, extra_length);
+    lea(a1, Address(a1, start_offset));
+    lea(a2, Address(a2, start_offset));
     // Check for short strings, i.e. smaller than wordSize.
     subs(cnt1, cnt1, elem_per_word);
     br(Assembler::LT, SHORT);
@@ -5641,18 +5650,18 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     cbz(a1, DONE);
     ldrw(cnt1, Address(a1, length_offset));
     cbz(a2, DONE);
-    ldrw(cnt2, Address(a2, length_offset));
+    // Increase loop counter by diff between base- and actual start-offset.
+    addw(cnt1, cnt1, extra_length);
+
     // on most CPUs a2 is still "locked"(surprisingly) in ldrw and it's
     // faster to perform another branch before comparing a1 and a2
     cmp(cnt1, (u1)elem_per_word);
     br(LE, SHORT); // short or same
-    ldr(tmp3, Address(pre(a1, base_offset)));
+    ldr(tmp3, Address(pre(a1, start_offset)));
     subs(zr, cnt1, stubBytesThreshold);
     br(GE, STUB);
-    ldr(tmp4, Address(pre(a2, base_offset)));
+    ldr(tmp4, Address(pre(a2, start_offset)));
     sub(tmp5, zr, cnt1, LSL, 3 + log_elem_size);
-    cmp(cnt2, cnt1);
-    br(NE, DONE);
 
     // Main 16 byte comparison loop with 2 exits
     bind(NEXT_DWORD); {
@@ -5684,9 +5693,7 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     b(LAST_CHECK);
 
     bind(STUB);
-    ldr(tmp4, Address(pre(a2, base_offset)));
-    cmp(cnt2, cnt1);
-    br(NE, DONE);
+    ldr(tmp4, Address(pre(a2, start_offset)));
     if (elem_size == 2) { // convert to byte counter
       lsl(cnt1, cnt1, 1);
     }
@@ -5707,12 +5714,9 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     mov(result, a2);
     b(DONE);
     bind(SHORT);
-    cmp(cnt2, cnt1);
-    br(NE, DONE);
-    cbz(cnt1, SAME);
     sub(tmp5, zr, cnt1, LSL, 3 + log_elem_size);
-    ldr(tmp3, Address(a1, base_offset));
-    ldr(tmp4, Address(a2, base_offset));
+    ldr(tmp3, Address(a1, start_offset));
+    ldr(tmp4, Address(a2, start_offset));
     bind(LAST_CHECK);
     eor(tmp4, tmp3, tmp4);
     lslv(tmp5, tmp4, tmp5);
diff --git a/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
index 5424f0d9c7572..332f24996930f 100644
--- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
@@ -32,7 +32,7 @@
 #include "runtime/safepoint.hpp"
 
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   if (verify_only)
     return;
 
diff --git a/src/hotspot/cpu/arm/relocInfo_arm.cpp b/src/hotspot/cpu/arm/relocInfo_arm.cpp
index fc5b2981ce69c..fb112cdcfc0fa 100644
--- a/src/hotspot/cpu/arm/relocInfo_arm.cpp
+++ b/src/hotspot/cpu/arm/relocInfo_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -30,13 +30,13 @@
 #include "oops/oop.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
 
   NativeMovConstReg* ni = nativeMovConstReg_at(addr());
   if (verify_only) {
-    guarantee(ni->data() == (intptr_t)(x + o), "instructions must match");
+    guarantee(ni->data() == (intptr_t)x, "instructions must match");
   } else {
-    ni->set_data((intptr_t)(x + o));
+    ni->set_data((intptr_t)x);
   }
 }
 
diff --git a/src/hotspot/cpu/ppc/relocInfo_ppc.cpp b/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
index 39e50465231ae..5d0d2785bf427 100644
--- a/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
+++ b/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,10 +32,7 @@
 #include "oops/oop.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
-  // Currently we don't support splitting of relocations.
-  assert(o == 0, "tried to split relocations");
-
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   if (!verify_only) {
     if (format() != 1) {
       nativeMovConstReg_at(addr())->set_data_plain(((intptr_t)x), code());
diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 388e7f9eb941f..2db57083ce5a6 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1887,8 +1887,12 @@ enum Nf {
   }
 
   // Vector Bit-manipulation used in Cryptography (Zvkb) Extension
-  INSN(vbrev8_v, 0b1010111, 0b010, 0b01000, 0b010010);
-  INSN(vrev8_v,  0b1010111, 0b010, 0b01001, 0b010010);
+  INSN(vbrev_v,  0b1010111, 0b010, 0b01010, 0b010010); // reverse bits in every element
+  INSN(vbrev8_v, 0b1010111, 0b010, 0b01000, 0b010010); // reverse bits in every byte of element
+  INSN(vrev8_v,  0b1010111, 0b010, 0b01001, 0b010010); // reverse bytes in every elememt
+
+  INSN(vclz_v,  0b1010111, 0b010, 0b01100, 0b010010); // count leading zeros
+  INSN(vctz_v,  0b1010111, 0b010, 0b01101, 0b010010); // count trailing zeros
 
 #undef INSN
 
@@ -1904,6 +1908,16 @@ enum Nf {
 
 #undef INSN
 
+#define INSN(NAME, op, funct3, Vs1, funct6)                                    \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, VectorMask vm = unmasked) { \
+    patch_VArith(op, Vd, funct3, Vs1, Vs2, vm, funct6);                        \
+  }
+
+  // Vector Basic Bit-manipulation (Zvbb) Extension
+  INSN(vcpop_v,  0b1010111, 0b010, 0b01110, 0b010010);
+
+#undef INSN
+
 #undef patch_VArith
 
 // ====================================
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index e22456cacc603..c39b29f6ee4a7 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -115,6 +115,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, UseZtso, false, EXPERIMENTAL, "Assume Ztso memory model")        \
   product(bool, UseZihintpause, false, EXPERIMENTAL,                             \
           "Use Zihintpause instructions")                                        \
+  product(bool, UseZvbb, false, EXPERIMENTAL, "Use Zvbb instructions")           \
   product(bool, UseZvfh, false, EXPERIMENTAL, "Use Zvfh instructions")           \
   product(bool, UseZvkn, false, EXPERIMENTAL,                                    \
           "Use Zvkn group extension, Zvkned, Zvknhb, Zvkb, Zvkt")                \
diff --git a/src/hotspot/cpu/riscv/relocInfo_riscv.cpp b/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
index 0e50d0b0796ca..b3cdb93a979d8 100644
--- a/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
+++ b/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +31,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   if (verify_only) {
     return;
   }
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 7869d6156e590..3d2cbbe5cf4dc 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -73,6 +73,12 @@ source %{
           return false;
         }
         break;
+      case Op_CountTrailingZerosV:
+      case Op_CountLeadingZerosV:
+      case Op_ReverseBytesV:
+      case Op_PopCountVL:
+      case Op_PopCountVI:
+        return UseZvbb;
       case Op_LoadVectorGather:
       case Op_LoadVectorGatherMasked:
         if (is_subword_type(bt)) {
@@ -3753,6 +3759,32 @@ instruct vsignum_reg(vReg dst, vReg zero, vReg one, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// -------------------------------- Reverse Bytes Vector Operations ------------------------
+
+instruct vreverse_bytes_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (ReverseBytesV dst_src v0));
+  format %{ "vreverse_bytes_masked $dst_src, $dst_src, v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vrev8_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreverse_bytes(vReg dst, vReg src) %{
+  match(Set dst (ReverseBytesV src));
+  format %{ "vreverse_bytes $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vrev8_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ---------------- Convert Half Floating to Floating Vector Operations ----------------
 
 // half precision -> single
@@ -3784,6 +3816,93 @@ instruct vconvF2HF(vReg dst, vReg src, vReg vtmp, vRegMask_V0 v0, iRegINoSp tmp)
   ins_pipe(pipe_slow);
 %}
 
+
+// ------------------------------ Popcount vector ------------------------------
+
+instruct vpopcount_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (PopCountVI dst_src v0));
+  match(Set dst_src (PopCountVL dst_src v0));
+  ins_cost(VEC_COST);
+  format %{ "vcpop_v $dst_src, $dst_src, $v0\t# vcpop_v with mask" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vcpop_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vpopcount(vReg dst, vReg src) %{
+  match(Set dst (PopCountVI src));
+  match(Set dst (PopCountVL src));
+  ins_cost(VEC_COST);
+  format %{ "vcpop_v $dst, $src\t# vcpop_v without mask" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vcpop_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// ------------------------------ CountLeadingZerosV --------------------------
+
+instruct vcountLeadingZeros_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (CountLeadingZerosV dst_src v0));
+  ins_cost(VEC_COST);
+  format %{ "vcount_leading_zeros_masked $dst_src, $dst_src, v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vclz_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vcountLeadingZeros(vReg dst, vReg src) %{
+  match(Set dst (CountLeadingZerosV src));
+  ins_cost(VEC_COST);
+  format %{ "vcount_leading_zeros $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vclz_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// ------------------------------ CountTrailingZerosV --------------------------
+
+instruct vcountTrailingZeros_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (CountTrailingZerosV dst_src v0));
+  ins_cost(VEC_COST);
+  format %{ "vcount_trailing_zeros_masked $dst_src, $dst_src, v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vctz_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vcountTrailingZeros(vReg dst, vReg src) %{
+  match(Set dst (CountTrailingZerosV src));
+  ins_cost(VEC_COST);
+  format %{ "vcount_trailing_zeros $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vctz_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector Load Gather ---------------------------
 
 instruct gather_load(vReg dst, indirect mem, vReg idx) %{
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 848ffe709d882..995e8b722485d 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -245,6 +245,12 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseChaCha20Intrinsics, false);
   }
 
+  // UseZvbb (depends on RVV).
+  if (UseZvbb && !UseRVV) {
+    FLAG_SET_DEFAULT(UseZvbb, false);
+    warning("Cannot enable UseZvbb on cpu without RVV support.");
+  }
+
   // SHA's
   if (FLAG_IS_DEFAULT(UseSHA)) {
     FLAG_SET_DEFAULT(UseSHA, true);
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index d26b16941dbfe..f3a834b72379c 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -161,6 +161,7 @@ class VM_Version : public Abstract_VM_Version {
   decl(ext_Ztso        , "Ztso"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZtso))        \
   decl(ext_Zihintpause , "Zihintpause" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZihintpause)) \
   decl(ext_Zacas       , "Zacas"       , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZacas))       \
+  decl(ext_Zvbb        , "Zvbb"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvbb))        \
   decl(ext_Zvfh        , "Zvfh"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvfh))        \
   decl(ext_Zvkn        , "Zvkn"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvkn))        \
   decl(mvendorid       , "VendorId"    , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)              \
diff --git a/src/hotspot/cpu/s390/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp
index 91cc7e611bfd1..cf80d164fafe6 100644
--- a/src/hotspot/cpu/s390/assembler_s390.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -352,10 +352,6 @@ class AddressLiteral {
 
   relocInfo::relocType rtype()       const { return _rspec.type(); }
   const RelocationHolder&    rspec() const { return _rspec; }
-
-  RelocationHolder rspec(int offset) const {
-    return offset == 0 ? _rspec : _rspec.plus(offset);
-  }
 };
 
 // Convenience classes
diff --git a/src/hotspot/cpu/s390/relocInfo_s390.cpp b/src/hotspot/cpu/s390/relocInfo_s390.cpp
index 747ae9c535d06..9e352be20a3a2 100644
--- a/src/hotspot/cpu/s390/relocInfo_s390.cpp
+++ b/src/hotspot/cpu/s390/relocInfo_s390.cpp
@@ -30,27 +30,25 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
-  // we don't support splitting of relocations, so o must be zero:
-  assert(o == 0, "tried to split relocations");
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   if (!verify_only) {
     switch (format()) {
       case relocInfo::uncompressed_format:
-        nativeMovConstReg_at(addr())->set_data_plain(((intptr_t)x) + o, code());
+        nativeMovConstReg_at(addr())->set_data_plain(((intptr_t)x), code());
         break;
       case relocInfo::compressed_format:
         if (type() == relocInfo::metadata_type)
-          nativeMovConstReg_at(addr())->set_narrow_klass(((intptr_t)x) + o);
+          nativeMovConstReg_at(addr())->set_narrow_klass(((intptr_t)x));
         else if (type() == relocInfo::oop_type)
-          nativeMovConstReg_at(addr())->set_narrow_oop(((intptr_t)x) + o);
+          nativeMovConstReg_at(addr())->set_narrow_oop(((intptr_t)x));
         else
           guarantee(false, "bad relocInfo type for relocInfo::narrow_oop_format");
         break;
       case relocInfo::pcrel_addr_format:  // patch target location
-        nativeMovConstReg_at(addr())->set_pcrel_addr(((intptr_t)x) + o, code());
+        nativeMovConstReg_at(addr())->set_pcrel_addr(((intptr_t)x), code());
         break;
       case relocInfo::pcrel_data_format:  // patch data at target location
-        nativeMovConstReg_at(addr())->set_pcrel_data(((intptr_t)x) + o, code());
+        nativeMovConstReg_at(addr())->set_pcrel_data(((intptr_t)x), code());
         break;
       default:
         assert(false, "not a valid relocInfo format");
diff --git a/src/hotspot/cpu/x86/relocInfo_x86.cpp b/src/hotspot/cpu/x86/relocInfo_x86.cpp
index db806419b51d4..d7fddf838ac8e 100644
--- a/src/hotspot/cpu/x86/relocInfo_x86.cpp
+++ b/src/hotspot/cpu/x86/relocInfo_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -36,9 +36,8 @@
 #include "utilities/checkedCast.hpp"
 
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
 #ifdef AMD64
-  x += o;
   typedef Assembler::WhichOperand WhichOperand;
   WhichOperand which = (WhichOperand) format(); // that is, disp32 or imm, call32, narrow oop
   assert(which == Assembler::disp32_operand ||
@@ -80,9 +79,9 @@ void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
   }
 #else
   if (verify_only) {
-    guarantee(*pd_address_in_code() == (x + o), "instructions must match");
+    guarantee(*pd_address_in_code() == x, "instructions must match");
   } else {
-    *pd_address_in_code() = x + o;
+    *pd_address_in_code() = x;
   }
 #endif // AMD64
 }
diff --git a/src/hotspot/cpu/zero/relocInfo_zero.cpp b/src/hotspot/cpu/zero/relocInfo_zero.cpp
index 1e9fdc1081d48..b926f20cfe7d8 100644
--- a/src/hotspot/cpu/zero/relocInfo_zero.cpp
+++ b/src/hotspot/cpu/zero/relocInfo_zero.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2009, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,7 +30,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   ShouldNotCallThis();
 }
 
diff --git a/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S b/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
index 54775cb7e8ede..a0f8577d8d199 100644
--- a/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
+++ b/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
@@ -36,7 +36,7 @@
     #  8(%esp) : default value
     #  4(%esp) : crash address
     #  0(%esp) : return pc
-    .type _SafeFetch32_impl,@function
+    .type SafeFetch32_impl,@function
 SafeFetch32_impl:
     movl 4(%esp),%ecx         # load address from stack
 _SafeFetch32_fault:
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 51399f03434f6..a98fd04ba6862 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -146,7 +146,7 @@ void ArchiveBuilder::SourceObjList::relocate(int i, ArchiveBuilder* builder) {
 }
 
 ArchiveBuilder::ArchiveBuilder() :
-  _current_dump_space(nullptr),
+  _current_dump_region(nullptr),
   _buffer_bottom(nullptr),
   _last_verified_top(nullptr),
   _num_dump_regions_used(0),
@@ -341,10 +341,10 @@ address ArchiveBuilder::reserve_buffer() {
 
   _buffer_bottom = buffer_bottom;
   _last_verified_top = buffer_bottom;
-  _current_dump_space = &_rw_region;
+  _current_dump_region = &_rw_region;
   _num_dump_regions_used = 1;
   _other_region_used_bytes = 0;
-  _current_dump_space->init(&_shared_rs, &_shared_vs);
+  _current_dump_region->init(&_shared_rs, &_shared_vs);
 
   ArchivePtrMarker::initialize(&_ptrmap, &_shared_vs);
 
@@ -560,21 +560,21 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
   }
 }
 
-void ArchiveBuilder::start_dump_space(DumpRegion* next) {
+void ArchiveBuilder::start_dump_region(DumpRegion* next) {
   address bottom = _last_verified_top;
-  address top = (address)(current_dump_space()->top());
+  address top = (address)(current_dump_region()->top());
   _other_region_used_bytes += size_t(top - bottom);
 
-  current_dump_space()->pack(next);
-  _current_dump_space = next;
+  current_dump_region()->pack(next);
+  _current_dump_region = next;
   _num_dump_regions_used ++;
 
-  _last_verified_top = (address)(current_dump_space()->top());
+  _last_verified_top = (address)(current_dump_region()->top());
 }
 
 void ArchiveBuilder::verify_estimate_size(size_t estimate, const char* which) {
   address bottom = _last_verified_top;
-  address top = (address)(current_dump_space()->top());
+  address top = (address)(current_dump_region()->top());
   size_t used = size_t(top - bottom) + _other_region_used_bytes;
   int diff = int(estimate) - int(used);
 
@@ -630,7 +630,7 @@ void ArchiveBuilder::dump_ro_metadata() {
   ResourceMark rm;
   log_info(cds)("Allocating RO objects ... ");
 
-  start_dump_space(&_ro_region);
+  start_dump_region(&_ro_region);
   make_shallow_copies(&_ro_region, &_ro_src_objs);
 
 #if INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index dab369265b0b4..cbde5a7e02cbc 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -91,7 +91,7 @@ const int SharedSpaceObjectAlignment = KlassAlignmentInBytes;
 //
 class ArchiveBuilder : public StackObj {
 protected:
-  DumpRegion* _current_dump_space;
+  DumpRegion* _current_dump_region;
   address _buffer_bottom;                      // for writing the contents of rw/ro regions
   address _last_verified_top;
   int _num_dump_regions_used;
@@ -114,7 +114,7 @@ class ArchiveBuilder : public StackObj {
 
   intx _buffer_to_requested_delta;
 
-  DumpRegion* current_dump_space() const {  return _current_dump_space;  }
+  DumpRegion* current_dump_region() const {  return _current_dump_region;  }
 
 public:
   enum FollowMode {
@@ -278,17 +278,17 @@ class ArchiveBuilder : public StackObj {
 
   size_t estimate_archive_size();
 
-  void start_dump_space(DumpRegion* next);
+  void start_dump_region(DumpRegion* next);
   void verify_estimate_size(size_t estimate, const char* which);
 
 public:
   address reserve_buffer();
 
-  address buffer_bottom()                    const { return _buffer_bottom;                       }
-  address buffer_top()                       const { return (address)current_dump_space()->top(); }
-  address requested_static_archive_bottom()  const { return  _requested_static_archive_bottom;    }
-  address mapped_static_archive_bottom()     const { return  _mapped_static_archive_bottom;       }
-  intx buffer_to_requested_delta()           const { return _buffer_to_requested_delta;           }
+  address buffer_bottom()                    const { return _buffer_bottom;                        }
+  address buffer_top()                       const { return (address)current_dump_region()->top(); }
+  address requested_static_archive_bottom()  const { return  _requested_static_archive_bottom;     }
+  address mapped_static_archive_bottom()     const { return  _mapped_static_archive_bottom;        }
+  intx buffer_to_requested_delta()           const { return _buffer_to_requested_delta;            }
 
   bool is_in_buffer_space(address p) const {
     return (buffer_bottom() <= p && p < buffer_top());
diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/archiveHeapWriter.cpp
index a86996d3b1fd8..d526a961b7f7b 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.cpp
+++ b/src/hotspot/share/cds/archiveHeapWriter.cpp
@@ -67,8 +67,10 @@ ArchiveHeapWriter::BufferOffsetToSourceObjectTable*
   ArchiveHeapWriter::_buffer_offset_to_source_obj_table = nullptr;
 
 
-typedef ResourceHashtable<address, size_t,
-      127, // prime number
+typedef ResourceHashtable<
+      size_t,    // offset of a filler from ArchiveHeapWriter::buffer_bottom()
+      size_t,    // size of this filler (in bytes)
+      127,       // prime number
       AnyObj::C_HEAP,
       mtClassShared> FillersTable;
 static FillersTable* _fillers;
@@ -361,12 +363,12 @@ void ArchiveHeapWriter::maybe_fill_gc_region_gap(size_t required_byte_size) {
                         array_length, fill_bytes, _buffer_used);
     HeapWord* filler = init_filler_array_at_buffer_top(array_length, fill_bytes);
     _buffer_used = filler_end;
-    _fillers->put((address)filler, fill_bytes);
+    _fillers->put(buffered_address_to_offset((address)filler), fill_bytes);
   }
 }
 
 size_t ArchiveHeapWriter::get_filler_size_at(address buffered_addr) {
-  size_t* p = _fillers->get(buffered_addr);
+  size_t* p = _fillers->get(buffered_address_to_offset(buffered_addr));
   if (p != nullptr) {
     assert(*p > 0, "filler must be larger than zero bytes");
     return *p;
@@ -530,10 +532,8 @@ void ArchiveHeapWriter::update_header_for_requested_obj(oop requested_obj, oop s
   fake_oop->set_narrow_klass(nk);
 
   // We need to retain the identity_hash, because it may have been used by some hashtables
-  // in the shared heap. This also has the side effect of pre-initializing the
-  // identity_hash for all shared objects, so they are less likely to be written
-  // into during run time, increasing the potential of memory sharing.
-  if (src_obj != nullptr) {
+  // in the shared heap.
+  if (src_obj != nullptr && !src_obj->fast_no_hash_check()) {
     intptr_t src_hash = src_obj->identity_hash();
     fake_oop->set_mark(markWord::prototype().copy_set_hash(src_hash));
     assert(fake_oop->mark().is_unlocked(), "sanity");
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 5ba36960c55b1..8fd20e2026700 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -310,18 +310,11 @@ void WriteClosure::do_ptr(void** p) {
   if (ptr != nullptr && !ArchiveBuilder::current()->is_in_buffer_space(ptr)) {
     ptr = ArchiveBuilder::current()->get_buffered_addr(ptr);
   }
-  _dump_region->append_intptr_t((intptr_t)ptr, true);
-}
-
-void WriteClosure::do_region(u_char* start, size_t size) {
-  assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");
-  assert(size % sizeof(intptr_t) == 0, "bad size");
-  do_tag((int)size);
-  while (size > 0) {
-    do_ptr((void**)start);
-    start += sizeof(intptr_t);
-    size -= sizeof(intptr_t);
+  // null pointers do not need to be converted to offsets
+  if (ptr != nullptr) {
+    ptr = (address)ArchiveBuilder::current()->buffer_to_offset(ptr);
   }
+  _dump_region->append_intptr_t((intptr_t)ptr, false);
 }
 
 void ReadClosure::do_ptr(void** p) {
@@ -329,7 +322,7 @@ void ReadClosure::do_ptr(void** p) {
   intptr_t obj = nextPtr();
   assert((intptr_t)obj >= 0 || (intptr_t)obj < -100,
          "hit tag while initializing ptrs.");
-  *p = (void*)obj;
+  *p = (void*)obj != nullptr ? (void*)(SharedBaseAddress + obj) : (void*)obj;
 }
 
 void ReadClosure::do_u4(u4* p) {
@@ -355,17 +348,6 @@ void ReadClosure::do_tag(int tag) {
   FileMapInfo::assert_mark(tag == old_tag);
 }
 
-void ReadClosure::do_region(u_char* start, size_t size) {
-  assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");
-  assert(size % sizeof(intptr_t) == 0, "bad size");
-  do_tag((int)size);
-  while (size > 0) {
-    *(intptr_t*)start = nextPtr();
-    start += sizeof(intptr_t);
-    size -= sizeof(intptr_t);
-  }
-}
-
 void ArchiveUtils::log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) {
   if (ClassListWriter::is_enabled()) {
     if (SystemDictionaryShared::is_supported_invokedynamic(bootstrap_specifier)) {
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index efe5a468b93b4..32cef97886f06 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -215,7 +215,10 @@ class WriteClosure : public SerializeClosure {
     _dump_region->append_intptr_t((intptr_t)tag);
   }
 
-  void do_region(u_char* start, size_t size);
+  char* region_top() {
+    return _dump_region->top();
+  }
+
   bool reading() const { return false; }
 };
 
@@ -238,8 +241,8 @@ class ReadClosure : public SerializeClosure {
   void do_int(int* p);
   void do_bool(bool *p);
   void do_tag(int tag);
-  void do_region(u_char* start, size_t size);
   bool reading() const { return true; }
+  char* region_top() { return nullptr; }
 };
 
 class ArchiveUtils {
diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index b17da725deb3f..4e49cd3d881c8 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -50,30 +50,24 @@
 #include "runtime/javaCalls.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/utf8.hpp"
 
 volatile Thread* ClassListParser::_parsing_thread = nullptr;
 ClassListParser* ClassListParser::_instance = nullptr;
 
-ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) : _id2klass_table(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE) {
+ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) :
+    _classlist_file(file),
+    _id2klass_table(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE),
+    _file_input(do_open(file), /* need_close=*/true),
+    _input_stream(&_file_input) {
   log_info(cds)("Parsing %s%s", file,
                 (parse_mode == _parse_lambda_forms_invokers_only) ? " (lambda form invokers only)" : "");
-  _classlist_file = file;
-  _file = nullptr;
-  // Use os::open() because neither fopen() nor os::fopen()
-  // can handle long path name on Windows.
-  int fd = os::open(file, O_RDONLY, S_IREAD);
-  if (fd != -1) {
-    // Obtain a File* from the file descriptor so that fgets()
-    // can be used in parse_one_line()
-    _file = os::fdopen(fd, "r");
-  }
-  if (_file == nullptr) {
+  if (!_file_input.is_open()) {
     char errmsg[JVM_MAXPATHLEN];
     os::lasterror(errmsg, JVM_MAXPATHLEN);
     vm_exit_during_initialization("Loading classlist failed", errmsg);
   }
-  _line_no = 0;
-  _token = _line;
+  _token = _line = nullptr;
   _interfaces = new (mtClass) GrowableArray<int>(10, mtClass);
   _indy_items = new (mtClass) GrowableArray<const char*>(9, mtClass);
   _parse_mode = parse_mode;
@@ -84,14 +78,24 @@ ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) : _id2k
   Atomic::store(&_parsing_thread, Thread::current());
 }
 
+FILE* ClassListParser::do_open(const char* file) {
+  // Use os::open() because neither fopen() nor os::fopen()
+  // can handle long path name on Windows. (See JDK-8216184)
+  int fd = os::open(file, O_RDONLY, S_IREAD);
+  FILE* fp = nullptr;
+  if (fd != -1) {
+    // Obtain a FILE* from the file descriptor so that _input_stream
+    // can be used in ClassListParser::parse()
+    fp = os::fdopen(fd, "r");
+  }
+  return fp;
+}
+
 bool ClassListParser::is_parsing_thread() {
   return Atomic::load(&_parsing_thread) == Thread::current();
 }
 
 ClassListParser::~ClassListParser() {
-  if (_file != nullptr) {
-    fclose(_file);
-  }
   Atomic::store(&_parsing_thread, (Thread*)nullptr);
   delete _indy_items;
   delete _interfaces;
@@ -101,7 +105,15 @@ ClassListParser::~ClassListParser() {
 int ClassListParser::parse(TRAPS) {
   int class_count = 0;
 
-  while (parse_one_line()) {
+  for (; !_input_stream.done(); _input_stream.next()) {
+    _line = _input_stream.current_line();
+    if (*_line == '#') { // comment
+      continue;
+    }
+    if (!parse_one_line()) {
+      break;
+    }
+
     if (lambda_form_line()) {
       // The current line is "@lambda-form-invoker ...". It has been recorded in LambdaFormInvokers,
       // and will be processed later.
@@ -112,6 +124,7 @@ int ClassListParser::parse(TRAPS) {
       continue;
     }
 
+    check_class_name(_class_name);
     TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name);
     if (_indy_items->length() > 0) {
       // The current line is "@lambda-proxy class_name". Load the proxy class.
@@ -165,43 +178,26 @@ int ClassListParser::parse(TRAPS) {
 }
 
 bool ClassListParser::parse_one_line() {
-  for (;;) {
-    if (fgets(_line, sizeof(_line), _file) == nullptr) {
-      return false;
-    }
-    ++ _line_no;
-    _line_len = (int)strlen(_line);
-    if (_line_len > _max_allowed_line_len) {
-      error("input line too long (must be no longer than %d chars)", _max_allowed_line_len);
-    }
-    if (*_line == '#') { // comment
-      continue;
-    }
-
-    {
-      int len = (int)strlen(_line);
-      int i;
-      // Replace \t\r\n\f with ' '
-      for (i=0; i<len; i++) {
-        if (_line[i] == '\t' || _line[i] == '\r' || _line[i] == '\n' || _line[i] == '\f') {
-          _line[i] = ' ';
-        }
+  {
+    int len = (int)strlen(_line);
+    int i;
+    // Replace \t\r\n\f with ' '
+    for (i=0; i<len; i++) {
+      if (_line[i] == '\t' || _line[i] == '\r' || _line[i] == '\n' || _line[i] == '\f') {
+        _line[i] = ' ';
       }
+    }
 
-      // Remove trailing newline/space
-      while (len > 0) {
-        if (_line[len-1] == ' ') {
-          _line[len-1] = '\0';
-          len --;
-        } else {
-          break;
-        }
+    // Remove trailing newline/space
+    while (len > 0) {
+      if (_line[len-1] == ' ') {
+        _line[len-1] = '\0';
+        len --;
+      } else {
+        break;
       }
-      _line_len = len;
     }
-
-    // valid line
-    break;
+    _line_len = len;
   }
 
   _class_name = _line;
@@ -286,7 +282,7 @@ int ClassListParser::split_at_tag_from_line() {
   _token = _line;
   char* ptr;
   if ((ptr = strchr(_line, ' ')) == nullptr) {
-    error("Too few items following the @ tag \"%s\" line #%d", _line, _line_no);
+    error("Too few items following the @ tag \"%s\" line #%zu", _line, lineno());
     return 0;
   }
   *ptr++ = '\0';
@@ -304,7 +300,7 @@ bool ClassListParser::parse_at_tags() {
   if (strcmp(_token, LAMBDA_PROXY_TAG) == 0) {
     split_tokens_by_whitespace(offset);
     if (_indy_items->length() < 2) {
-      error("Line with @ tag has too few items \"%s\" line #%d", _token, _line_no);
+      error("Line with @ tag has too few items \"%s\" line #%zu", _token, lineno());
       return false;
     }
     // set the class name
@@ -315,7 +311,7 @@ bool ClassListParser::parse_at_tags() {
     _lambda_form_line = true;
     return true;
   } else {
-    error("Invalid @ tag at the beginning of line \"%s\" line #%d", _token, _line_no);
+    error("Invalid @ tag at the beginning of line \"%s\" line #%zu", _token, lineno());
     return false;
   }
 }
@@ -423,8 +419,8 @@ void ClassListParser::error(const char* msg, ...) {
   }
 
   jio_fprintf(defaultStream::error_stream(),
-              "An error has occurred while processing class list file %s %d:%d.\n",
-              _classlist_file, _line_no, (error_index + 1));
+              "An error has occurred while processing class list file %s %zu:%d.\n",
+              _classlist_file, lineno(), (error_index + 1));
   jio_vfprintf(defaultStream::error_stream(), msg, ap);
 
   if (_line_len <= 0) {
@@ -450,6 +446,25 @@ void ClassListParser::error(const char* msg, ...) {
   va_end(ap);
 }
 
+void ClassListParser::check_class_name(const char* class_name) {
+  const char* err = nullptr;
+  size_t len = strlen(class_name);
+  if (len > (size_t)Symbol::max_length()) {
+    err = "class name too long";
+  } else {
+    assert(Symbol::max_length() < INT_MAX && len < INT_MAX, "must be");
+    if (!UTF8::is_legal_utf8((const unsigned char*)class_name, (int)len, /*version_leq_47*/false)) {
+      err = "class name is not valid UTF8";
+    }
+  }
+  if (err != nullptr) {
+    jio_fprintf(defaultStream::error_stream(),
+              "An error has occurred while processing class list file %s:%zu %s\n",
+              _classlist_file, lineno(), err);
+    vm_exit_during_initialization("class list format error.", nullptr);
+  }
+}
+
 // This function is used for loading classes for customized class loaders
 // during archive dumping.
 InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS) {
diff --git a/src/hotspot/share/cds/classListParser.hpp b/src/hotspot/share/cds/classListParser.hpp
index 74a2ff10515f8..a383e04d8e6fe 100644
--- a/src/hotspot/share/cds/classListParser.hpp
+++ b/src/hotspot/share/cds/classListParser.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -28,6 +28,7 @@
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/istream.hpp"
 #include "utilities/resizeableResourceHash.hpp"
 
 #define LAMBDA_PROXY_TAG "@lambda-proxy"
@@ -80,14 +81,6 @@ class ClassListParser : public StackObj {
 
   enum {
     _unspecified      = -999,
-
-    // Max number of bytes allowed per line in the classlist.
-    // Theoretically Java class names could be 65535 bytes in length. Also, an input line
-    // could have a very long path name up to JVM_MAXPATHLEN bytes in length. In reality,
-    // 4K bytes is more than enough.
-    _max_allowed_line_len = 4096,
-    _line_buf_extra       = 10, // for detecting input too long
-    _line_buf_size        = _max_allowed_line_len + _line_buf_extra
   };
 
   // Use a small initial size in debug build to test resizing logic
@@ -96,16 +89,14 @@ class ClassListParser : public StackObj {
   static volatile Thread* _parsing_thread; // the thread that created _instance
   static ClassListParser* _instance; // the singleton.
   const char* _classlist_file;
-  FILE* _file;
 
   ID2KlassTable _id2klass_table;
 
-  // The following field contains information from the *current* line being
-  // parsed.
-  char                _line[_line_buf_size];  // The buffer that holds the current line. Some characters in
+  FileInput           _file_input;
+  inputStream         _input_stream;
+  char*               _line;                  // The buffer that holds the current line. Some characters in
                                               // the buffer may be overwritten by '\0' during parsing.
   int                 _line_len;              // Original length of the input line.
-  int                 _line_no;               // Line number for current line being parsed
   const char*         _class_name;
   GrowableArray<const char*>* _indy_items;    // items related to invoke dynamic for archiving lambda proxy classes
   int                 _id;
@@ -132,6 +123,8 @@ class ClassListParser : public StackObj {
   bool parse_one_line();
   Klass* load_current_class(Symbol* class_name_symbol, TRAPS);
 
+  size_t lineno() { return _input_stream.lineno(); }
+  FILE* do_open(const char* file);
   ClassListParser(const char* file, ParseMode _parse_mode);
   ~ClassListParser();
 
@@ -183,6 +176,7 @@ class ClassListParser : public StackObj {
       error("%s id %d is not yet loaded", which, id);
     }
   }
+  void check_class_name(const char* class_name);
 
   const char* current_class_name() {
     return _class_name;
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index c339ce9c0deaa..f17d94a82fdb5 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -213,23 +213,30 @@ void CppVtableCloner<T>::init_orig_cpp_vtptr(int kind) {
 // the following holds true:
 //     _index[ConstantPool_Kind]->cloned_vtable()  == ((intptr_t**)cp)[0]
 //     _index[InstanceKlass_Kind]->cloned_vtable() == ((intptr_t**)ik)[0]
-CppVtableInfo** CppVtables::_index = nullptr;
+static CppVtableInfo* _index[_num_cloned_vtable_kinds];
 
-char* CppVtables::dumptime_init(ArchiveBuilder* builder) {
+// Vtables are all fixed offsets from ArchiveBuilder::current()->mapped_base()
+// E.g. ConstantPool is at offset 0x58. We can archive these offsets in the
+// RO region and use them to alculate their location at runtime without storing
+// the pointers in the RW region
+char* CppVtables::_vtables_serialized_base = nullptr;
+
+void CppVtables::dumptime_init(ArchiveBuilder* builder) {
   assert(CDSConfig::is_dumping_static_archive(), "cpp tables are only dumped into static archive");
-  size_t vtptrs_bytes = _num_cloned_vtable_kinds * sizeof(CppVtableInfo*);
-  _index = (CppVtableInfo**)builder->rw_region()->allocate(vtptrs_bytes);
 
   CPP_VTABLE_TYPES_DO(ALLOCATE_AND_INITIALIZE_VTABLE);
 
   size_t cpp_tables_size = builder->rw_region()->top() - builder->rw_region()->base();
   builder->alloc_stats()->record_cpp_vtables((int)cpp_tables_size);
-
-  return (char*)_index;
 }
 
 void CppVtables::serialize(SerializeClosure* soc) {
-  soc->do_ptr(&_index);
+  if (!soc->reading()) {
+    _vtables_serialized_base = (char*)ArchiveBuilder::current()->buffer_top();
+  }
+  for (int i = 0; i < _num_cloned_vtable_kinds; i++) {
+    soc->do_ptr(&_index[i]);
+  }
   if (soc->reading()) {
     CPP_VTABLE_TYPES_DO(INITIALIZE_VTABLE);
   }
diff --git a/src/hotspot/share/cds/cppVtables.hpp b/src/hotspot/share/cds/cppVtables.hpp
index 5318a9de2ba95..973502909ddf4 100644
--- a/src/hotspot/share/cds/cppVtables.hpp
+++ b/src/hotspot/share/cds/cppVtables.hpp
@@ -36,13 +36,14 @@ class CppVtableInfo;
 
 // Support for C++ vtables in CDS archive.
 class CppVtables : AllStatic {
-  static CppVtableInfo** _index;
+  static char* _vtables_serialized_base;
 public:
-  static char* dumptime_init(ArchiveBuilder* builder);
+  static void dumptime_init(ArchiveBuilder* builder);
   static void zero_archived_vtables();
   static intptr_t* get_archived_vtable(MetaspaceObj::Type msotype, address obj);
   static void serialize(SerializeClosure* sc);
   static bool is_valid_shared_method(const Method* m) NOT_CDS_RETURN_(false);
+  static char* vtables_serialized_base() { return _vtables_serialized_base; }
 };
 
 #endif // SHARE_CDS_CPPVTABLES_HPP
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index cd5dd88b09939..f255b337d148f 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -137,7 +137,7 @@ class DynamicArchiveBuilder : public ArchiveBuilder {
       // Note that these tables still point to the *original* objects, so
       // they would need to call DynamicArchive::original_to_target() to
       // get the correct addresses.
-      assert(current_dump_space() == ro_region(), "Must be RO space");
+      assert(current_dump_region() == ro_region(), "Must be RO space");
       SymbolTable::write_to_archive(symbols());
 
       ArchiveBuilder::OtherROAllocMark mark;
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 202042e622e0b..b9f5d963c85ac 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -278,12 +278,6 @@ bool HeapShared::archive_object(oop obj) {
   } else {
     count_allocation(obj->size());
     ArchiveHeapWriter::add_source_obj(obj);
-
-    // The archived objects are discovered in a predictable order. Compute
-    // their identity_hash() as soon as we see them. This ensures that the
-    // the identity_hash in the object header will have a predictable value,
-    // making the archive reproducible.
-    obj->identity_hash();
     CachedOopInfo info = make_cached_oop_info(obj);
     archived_object_cache()->put_when_absent(obj, info);
     archived_object_cache()->maybe_grow();
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index c7d14f83d036a..93c5c1a1e3b00 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -511,7 +511,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   builder.gather_source_objs();
   builder.reserve_buffer();
 
-  char* cloned_vtables = CppVtables::dumptime_init(&builder);
+  CppVtables::dumptime_init(&builder);
 
   builder.sort_metadata_objs();
   builder.dump_rw_metadata();
@@ -542,7 +542,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   FileMapInfo* mapinfo = new FileMapInfo(static_archive, true);
   mapinfo->populate_header(MetaspaceShared::core_region_alignment());
   mapinfo->set_serialized_data(serialized_data);
-  mapinfo->set_cloned_vtables(cloned_vtables);
+  mapinfo->set_cloned_vtables(CppVtables::vtables_serialized_base());
   mapinfo->open_for_write();
   builder.write_archive(mapinfo, &_heap_info);
 
diff --git a/src/hotspot/share/cds/serializeClosure.hpp b/src/hotspot/share/cds/serializeClosure.hpp
index 275009286cb81..3d401407f37a1 100644
--- a/src/hotspot/share/cds/serializeClosure.hpp
+++ b/src/hotspot/share/cds/serializeClosure.hpp
@@ -48,8 +48,20 @@ class SerializeClosure : public StackObj {
   // Read/write the bool pointed to by p.
   virtual void do_bool(bool* p) = 0;
 
-  // Read/write the region specified.
-  virtual void do_region(u_char* start, size_t size) = 0;
+  // Iterate on the pointers from p[0] through p[num_pointers-1]
+  void do_ptrs(void** p, size_t size) {
+    assert((intptr_t)p % sizeof(intptr_t) == 0, "bad alignment");
+    assert(size % sizeof(intptr_t) == 0, "bad size");
+    do_tag((int)size);
+    while (size > 0) {
+      do_ptr(p);
+      p++;
+      size -= sizeof(intptr_t);
+    }
+  }
+
+  // Address of the first element being written (write only)
+  virtual char* region_top() = 0;
 
   // Check/write the tag.  If reading, then compare the tag against
   // the passed in value and fail is they don't match.  This allows
diff --git a/src/hotspot/share/classfile/vmSymbols.cpp b/src/hotspot/share/classfile/vmSymbols.cpp
index 05cd4767e9a6d..172d074255b38 100644
--- a/src/hotspot/share/classfile/vmSymbols.cpp
+++ b/src/hotspot/share/classfile/vmSymbols.cpp
@@ -205,9 +205,9 @@ void vmSymbols::metaspace_pointers_do(MetaspaceClosure *closure) {
 }
 
 void vmSymbols::serialize(SerializeClosure* soc) {
-  soc->do_region((u_char*)&Symbol::_vm_symbols[FIRST_SID],
+  soc->do_ptrs((void**)&Symbol::_vm_symbols[FIRST_SID],
                  (SID_LIMIT - FIRST_SID) * sizeof(Symbol::_vm_symbols[0]));
-  soc->do_region((u_char*)_type_signatures, sizeof(_type_signatures));
+  soc->do_ptrs((void**)_type_signatures, sizeof(_type_signatures));
 }
 
 #ifndef PRODUCT
diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index 69ff4bc78d639..d0f732edac486 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -277,30 +277,6 @@ DEFINE_COPY_INTO_AUX(Relocation)
 #undef DEFINE_COPY_INTO_AUX
 #undef DEFINE_COPY_INTO
 
-//////// Methods for RelocationHolder
-
-RelocationHolder RelocationHolder::plus(int offset) const {
-  if (offset != 0) {
-    switch (type()) {
-    case relocInfo::none:
-      break;
-    case relocInfo::oop_type:
-      {
-        oop_Relocation* r = (oop_Relocation*)reloc();
-        return oop_Relocation::spec(r->oop_index(), r->offset() + offset);
-      }
-    case relocInfo::metadata_type:
-      {
-        metadata_Relocation* r = (metadata_Relocation*)reloc();
-        return metadata_Relocation::spec(r->metadata_index(), r->offset() + offset);
-      }
-    default:
-      ShouldNotReachHere();
-    }
-  }
-  return (*this);
-}
-
 //////// Methods for flyweight Relocation types
 
 // some relocations can compute their own values
@@ -402,24 +378,24 @@ void CallRelocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer
 
 void oop_Relocation::pack_data_to(CodeSection* dest) {
   short* p = (short*) dest->locs_end();
-  p = pack_2_ints_to(p, _oop_index, _offset);
+  p = pack_1_int_to(p, _oop_index);
   dest->set_locs_end((relocInfo*) p);
 }
 
 
 void oop_Relocation::unpack_data() {
-  unpack_2_ints(_oop_index, _offset);
+  _oop_index = unpack_1_int();
 }
 
 void metadata_Relocation::pack_data_to(CodeSection* dest) {
   short* p = (short*) dest->locs_end();
-  p = pack_2_ints_to(p, _metadata_index, _offset);
+  p = pack_1_int_to(p, _metadata_index);
   dest->set_locs_end((relocInfo*) p);
 }
 
 
 void metadata_Relocation::unpack_data() {
-  unpack_2_ints(_metadata_index, _offset);
+  _metadata_index = unpack_1_int();
 }
 
 
@@ -855,8 +831,8 @@ void RelocIterator::print_current() {
         raw_oop   = *oop_addr;
         oop_value = r->oop_value();
       }
-      tty->print(" | [oop_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT " offset=%d]",
-                 p2i(oop_addr), p2i(raw_oop), r->offset());
+      tty->print(" | [oop_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT "]",
+                 p2i(oop_addr), p2i(raw_oop));
       // Do not print the oop by default--we want this routine to
       // work even during GC or other inconvenient times.
       if (WizardMode && oop_value != nullptr) {
@@ -878,8 +854,8 @@ void RelocIterator::print_current() {
         raw_metadata   = *metadata_addr;
         metadata_value = r->metadata_value();
       }
-      tty->print(" | [metadata_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT " offset=%d]",
-                 p2i(metadata_addr), p2i(raw_metadata), r->offset());
+      tty->print(" | [metadata_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT "]",
+                 p2i(metadata_addr), p2i(raw_metadata));
       if (metadata_value != nullptr) {
         tty->print("metadata_value=" INTPTR_FORMAT ": ", p2i(metadata_value));
         metadata_value->print_value_on(tty);
diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp
index 9f1db9f4684e3..6d0907d97dedc 100644
--- a/src/hotspot/share/code/relocInfo.hpp
+++ b/src/hotspot/share/code/relocInfo.hpp
@@ -129,12 +129,7 @@ class nmethod;
 //   Value:  an oop, or else the address (handle) of an oop
 //   Instruction types: memory (load), set (load address)
 //   Data:  []       an oop stored in 4 bytes of instruction
-//          [n]      n is the index of an oop in the CodeBlob's oop pool
-//          [[N]n l] and l is a byte offset to be applied to the oop
-//          [Nn Ll]  both index and offset may be 32 bits if necessary
-//   Here is a special hack, used only by the old compiler:
-//          [[N]n 00] the value is the __address__ of the nth oop in the pool
-//   (Note that the offset allows optimal references to class variables.)
+//          [[N]n]   the index of an oop in the CodeBlob's oop pool
 //
 // relocInfo::internal_word_type -- an address within the same CodeBlob
 // relocInfo::section_word_type -- same, but can refer to another section
@@ -515,9 +510,6 @@ class RelocationHolder {
   Relocation* reloc() const { return (Relocation*)_relocbuf; }
   inline relocInfo::relocType type() const;
 
-  // Add a constant offset to a relocation.  Helper for class Address.
-  RelocationHolder plus(int offset) const;
-
   // Return a holder containing a relocation of type Reloc, constructed using args.
   template<typename Reloc, typename... Args>
   static RelocationHolder construct(const Args&... args) {
@@ -788,8 +780,8 @@ class Relocation {
   void       const_set_data_value    (address x);
   void       const_verify_data_value (address x);
   // platform-dependent utilities for decoding and patching instructions
-  void       pd_set_data_value       (address x, intptr_t off, bool verify_only = false); // a set or mem-ref
-  void       pd_verify_data_value    (address x, intptr_t off) { pd_set_data_value(x, off, true); }
+  void       pd_set_data_value       (address x, bool verify_only = false); // a set or mem-ref
+  void       pd_verify_data_value    (address x) { pd_set_data_value(x, true); }
   address    pd_call_destination     (address orig_addr = nullptr);
   void       pd_set_call_destination (address x);
 
@@ -895,41 +887,28 @@ relocInfo::relocType RelocationHolder::type() const {
 // A DataRelocation always points at a memory or load-constant instruction..
 // It is absolute on most machines, and the constant is split on RISCs.
 // The specific subtypes are oop, external_word, and internal_word.
-// By convention, the "value" does not include a separately reckoned "offset".
 class DataRelocation : public Relocation {
  public:
   DataRelocation(relocInfo::relocType type) : Relocation(type) {}
 
-  bool          is_data() override             { return true; }
+  bool    is_data() override { return true; }
 
-  // both target and offset must be computed somehow from relocation data
-  virtual int    offset()                      { return 0; }
-  address         value() override             = 0;
-  void        set_value(address x) override    { set_value(x, offset()); }
-  void        set_value(address x, intptr_t o) {
-    if (addr_in_const())
+  // target must be computed somehow from relocation data
+  address value() override = 0;
+  void    set_value(address x) override {
+    if (addr_in_const()) {
       const_set_data_value(x);
-    else
-      pd_set_data_value(x, o);
+    } else {
+      pd_set_data_value(x);
+    }
   }
-  void        verify_value(address x) {
-    if (addr_in_const())
+  void    verify_value(address x) {
+    if (addr_in_const()) {
       const_verify_data_value(x);
-    else
-      pd_verify_data_value(x, offset());
+    } else {
+      pd_verify_data_value(x);
+    }
   }
-
-  // The "o" (displacement) argument is relevant only to split relocations
-  // on RISC machines.  In some CPUs (SPARC), the set-hi and set-lo ins'ns
-  // can encode more than 32 bits between them.  This allows compilers to
-  // share set-hi instructions between addresses that differ by a small
-  // offset (e.g., different static variables in the same class).
-  // On such machines, the "x" argument to set_value on all set-lo
-  // instructions must be the same as the "x" argument for the
-  // corresponding set-hi instructions.  The "o" arguments for the
-  // set-hi instructions are ignored, and must not affect the high-half
-  // immediate constant.  The "o" arguments for the set-lo instructions are
-  // added into the low-half immediate constant, and must not overflow it.
 };
 
 class post_call_nop_Relocation : public Relocation {
@@ -976,40 +955,36 @@ class CallRelocation : public Relocation {
 
 class oop_Relocation : public DataRelocation {
  public:
-  // encode in one of these formats:  [] [n] [n l] [Nn l] [Nn Ll]
-  // an oop in the CodeBlob's oop pool
-  static RelocationHolder spec(int oop_index, int offset = 0) {
+  // an oop in the CodeBlob's oop pool; encoded as [n] or [Nn]
+  static RelocationHolder spec(int oop_index) {
     assert(oop_index > 0, "must be a pool-resident oop");
-    return RelocationHolder::construct<oop_Relocation>(oop_index, offset);
+    return RelocationHolder::construct<oop_Relocation>(oop_index);
   }
-  // an oop in the instruction stream
+  // an oop in the instruction stream; encoded as []
   static RelocationHolder spec_for_immediate() {
     // If no immediate oops are generated, we can skip some walks over nmethods.
     // Assert that they don't get generated accidentally!
     assert(relocInfo::mustIterateImmediateOopsInCode(),
            "Must return true so we will search for oops as roots etc. in the code.");
     const int oop_index = 0;
-    const int offset    = 0;    // if you want an offset, use the oop pool
-    return RelocationHolder::construct<oop_Relocation>(oop_index, offset);
+    return RelocationHolder::construct<oop_Relocation>(oop_index);
   }
 
   void copy_into(RelocationHolder& holder) const override;
 
  private:
   jint _oop_index;                  // if > 0, index into CodeBlob::oop_at
-  jint _offset;                     // byte offset to apply to the oop itself
 
-  oop_Relocation(int oop_index, int offset)
-    : DataRelocation(relocInfo::oop_type), _oop_index(oop_index), _offset(offset) { }
+  oop_Relocation(int oop_index)
+    : DataRelocation(relocInfo::oop_type), _oop_index(oop_index) { }
 
   friend class RelocationHolder;
   oop_Relocation() : DataRelocation(relocInfo::oop_type) {}
 
  public:
   int oop_index() { return _oop_index; }
-  int offset() override { return _offset; }
 
-  // data is packed in "2_ints" format:  [i o] or [Ii Oo]
+  // oop_index is packed in "1_int" format:  [n] or [Nn]
   void pack_data_to(CodeSection* dest) override;
   void unpack_data() override;
 
@@ -1031,27 +1006,24 @@ class oop_Relocation : public DataRelocation {
 class metadata_Relocation : public DataRelocation {
 
  public:
-  // encode in one of these formats:  [] [n] [n l] [Nn l] [Nn Ll]
-  // an metadata in the CodeBlob's metadata pool
-  static RelocationHolder spec(int metadata_index, int offset = 0) {
+  // an metadata in the CodeBlob's metadata pool; encoded as [n] or [Nn]
+  static RelocationHolder spec(int metadata_index) {
     assert(metadata_index > 0, "must be a pool-resident metadata");
-    return RelocationHolder::construct<metadata_Relocation>(metadata_index, offset);
+    return RelocationHolder::construct<metadata_Relocation>(metadata_index);
   }
-  // an metadata in the instruction stream
+  // an metadata in the instruction stream; encoded as []
   static RelocationHolder spec_for_immediate() {
     const int metadata_index = 0;
-    const int offset    = 0;    // if you want an offset, use the metadata pool
-    return RelocationHolder::construct<metadata_Relocation>(metadata_index, offset);
+    return RelocationHolder::construct<metadata_Relocation>(metadata_index);
   }
 
   void copy_into(RelocationHolder& holder) const override;
 
  private:
   jint _metadata_index;            // if > 0, index into nmethod::metadata_at
-  jint _offset;                     // byte offset to apply to the metadata itself
 
-  metadata_Relocation(int metadata_index, int offset)
-    : DataRelocation(relocInfo::metadata_type), _metadata_index(metadata_index), _offset(offset) { }
+  metadata_Relocation(int metadata_index)
+    : DataRelocation(relocInfo::metadata_type), _metadata_index(metadata_index) { }
 
   friend class RelocationHolder;
   metadata_Relocation() : DataRelocation(relocInfo::metadata_type) { }
@@ -1063,9 +1035,8 @@ class metadata_Relocation : public DataRelocation {
 
  public:
   int metadata_index() { return _metadata_index; }
-  int offset() override { return _offset; }
 
-  // data is packed in "2_ints" format:  [i o] or [Ii Oo]
+  // metadata_index is packed in "1_int" format:  [n] or [Nn]
   void pack_data_to(CodeSection* dest) override;
   void unpack_data() override;
 
diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 585d55febb8e7..196a11fd06537 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -181,10 +181,16 @@ class MemStatEntry : public CHeapObj<mtInternal> {
   int _num_recomp;
   // Compiling thread. Only for diagnostic purposes. Thread may not be alive anymore.
   const Thread* _thread;
+  // active limit for this compilation, if any
+  size_t _limit;
 
+  // peak usage, bytes, over all arenas
   size_t _total;
+  // usage in node arena when total peaked
   size_t _na_at_peak;
+  // usage in resource area when total peaked
   size_t _ra_at_peak;
+  // number of nodes (c2 only) when total peaked
   unsigned _live_nodes_at_peak;
   const char* _result;
 
@@ -192,7 +198,7 @@ class MemStatEntry : public CHeapObj<mtInternal> {
 
   MemStatEntry(FullMethodName method)
     : _method(method), _comptype(compiler_c1),
-      _time(0), _num_recomp(0), _thread(nullptr),
+      _time(0), _num_recomp(0), _thread(nullptr), _limit(0),
       _total(0), _na_at_peak(0), _ra_at_peak(0), _live_nodes_at_peak(0),
       _result(nullptr) {
   }
@@ -200,6 +206,7 @@ class MemStatEntry : public CHeapObj<mtInternal> {
   void set_comptype(CompilerType comptype) { _comptype = comptype; }
   void set_current_time() { _time = os::elapsedTime(); }
   void set_current_thread() { _thread = Thread::current(); }
+  void set_limit(size_t limit) { _limit = limit; }
   void inc_recompilation() { _num_recomp++; }
 
   void set_total(size_t n) { _total = n; }
@@ -218,6 +225,7 @@ class MemStatEntry : public CHeapObj<mtInternal> {
     st->print_cr("  RA     : ...how much in resource areas");
     st->print_cr("  result : Result: 'ok' finished successfully, 'oom' hit memory limit, 'err' compilation failed");
     st->print_cr("  #nodes : ...how many nodes (c2 only)");
+    st->print_cr("  limit  : memory limit, if set");
     st->print_cr("  time   : time of last compilation (sec)");
     st->print_cr("  type   : compiler type");
     st->print_cr("  #rc    : how often recompiled");
@@ -225,7 +233,7 @@ class MemStatEntry : public CHeapObj<mtInternal> {
   }
 
   static void print_header(outputStream* st) {
-    st->print_cr("total     NA        RA        result  #nodes  time    type  #rc thread              method");
+    st->print_cr("total     NA        RA        result  #nodes  limit   time    type  #rc thread              method");
   }
 
   void print_on(outputStream* st, bool human_readable) const {
@@ -260,7 +268,19 @@ class MemStatEntry : public CHeapObj<mtInternal> {
     col += 8; st->fill_to(col);
 
     // Number of Nodes when memory peaked
-    st->print("%u ", _live_nodes_at_peak);
+    if (_live_nodes_at_peak > 0) {
+      st->print("%u ", _live_nodes_at_peak);
+    } else {
+      st->print("-");
+    }
+    col += 8; st->fill_to(col);
+
+    // Limit
+    if (_limit > 0) {
+      st->print(PROPERFMT " ", PROPERFMTARGS(_limit));
+    } else {
+      st->print("-");
+    }
     col += 8; st->fill_to(col);
 
     // TimeStamp
@@ -322,7 +342,7 @@ class MemStatTable :
 
   void add(const FullMethodName& fmn, CompilerType comptype,
            size_t total, size_t na_at_peak, size_t ra_at_peak,
-           unsigned live_nodes_at_peak, const char* result) {
+           unsigned live_nodes_at_peak, size_t limit, const char* result) {
     assert_lock_strong(NMTCompilationCostHistory_lock);
     MemStatTableKey key(fmn, comptype);
     MemStatEntry** pe = get(key);
@@ -343,6 +363,7 @@ class MemStatTable :
     e->set_na_at_peak(na_at_peak);
     e->set_ra_at_peak(ra_at_peak);
     e->set_live_nodes_at_peak(live_nodes_at_peak);
+    e->set_limit(limit);
     e->set_result(result);
   }
 
@@ -430,6 +451,7 @@ void CompilationMemoryStatistic::on_end_compilation() {
                     arena_stat->na_at_peak(),
                     arena_stat->ra_at_peak(),
                     arena_stat->live_nodes_at_peak(),
+                    arena_stat->limit(),
                     result);
   }
   if (print) {
@@ -521,8 +543,8 @@ void CompilationMemoryStatistic::on_arena_change(ssize_t diff, const Arena* aren
         if (ct != compiler_none && name[0] != '\0') {
           ss.print("%s %s: ", compilertype2name(ct), name);
         }
-        ss.print("Hit MemLimit %s (limit: %zu now: %zu)",
-                 (hit_limit_before ? "again" : ""),
+        ss.print("Hit MemLimit %s(limit: %zu now: %zu)",
+                 (hit_limit_before ? "again " : ""),
                  arena_stat->limit(), arena_stat->peak_since_start());
       }
 
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 0935ea6a8e132..ddd5b2f0eb7e9 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -38,6 +38,7 @@
 #include "compiler/compilerEvent.hpp"
 #include "compiler/compilerOracle.hpp"
 #include "compiler/directivesParser.hpp"
+#include "gc/shared/memAllocator.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "jvm.h"
 #include "jfr/jfrEvents.hpp"
@@ -1396,6 +1397,7 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
   assert(!HAS_PENDING_EXCEPTION, "No exception should be present");
   // some prerequisites that are compiler specific
   if (comp->is_c2() || comp->is_jvmci()) {
+    InternalOOMEMark iom(THREAD);
     method->constants()->resolve_string_constants(CHECK_AND_CLEAR_NONASYNC_NULL);
     // Resolve all classes seen in the signature of the method
     // we are compiling.
diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index ea09e3ebb7f75..a81d60c9fc422 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -40,8 +40,26 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/os.hpp"
+#include "utilities/istream.hpp"
 #include "utilities/parseInteger.hpp"
 
+// Default compile commands, if defined, are parsed before any of the
+// explicitly defined compile commands. Thus, explicitly defined compile
+// commands take precedence over default compile commands. The effect is
+// as if the default compile commands had been specified at the start of
+// the command line.
+static const char* const default_compile_commands[] = {
+#ifdef ASSERT
+    // In debug builds, impose a (generous) per-compilation memory limit
+    // to catch pathological compilations during testing. The suboption
+    // "crash" will cause the JVM to assert.
+    //
+    // Note: to disable the default limit at the command line,
+    // set a limit of 0 (e.g. -XX:CompileCommand=MemLimit,*.*,0).
+    "MemLimit,*.*,1G~crash",
+#endif
+    nullptr };
+
 static const char* optiontype_names[] = {
 #define enum_of_types(type, name) name,
         OPTION_TYPES(enum_of_types)
@@ -905,6 +923,14 @@ class LineCopy : StackObj {
     }
 };
 
+bool CompilerOracle::parse_from_line_quietly(char* line) {
+  const bool quiet0 = _quiet;
+  _quiet = true;
+  const bool result = parse_from_line(line);
+  _quiet = quiet0;
+  return result;
+}
+
 bool CompilerOracle::parse_from_line(char* line) {
   if ((line[0] == '\0') || (line[0] == '#')) {
     return true;
@@ -1056,57 +1082,39 @@ bool CompilerOracle::parse_from_file() {
     return true;
   }
 
-  char token[1024];
-  int  pos = 0;
-  int  c = getc(stream);
-  bool success = true;
-  while(c != EOF && pos < (int)(sizeof(token)-1)) {
-    if (c == '\n') {
-      token[pos++] = '\0';
-      if (!parse_from_line(token)) {
-        success = false;
-      }
-      pos = 0;
-    } else {
-      token[pos++] = c;
-    }
-    c = getc(stream);
-  }
-  token[pos++] = '\0';
-  if (!parse_from_line(token)) {
-    success = false;
-  }
-  fclose(stream);
-  return success;
+  FileInput input(stream, /*need_close=*/ true);
+  return parse_from_input(&input, parse_from_line);
 }
 
-bool CompilerOracle::parse_from_string(const char* str, bool (*parse_line)(char*)) {
-  char token[1024];
-  int  pos = 0;
-  const char* sp = str;
-  int  c = *sp++;
+bool CompilerOracle::parse_from_input(inputStream::Input* input,
+                                      CompilerOracle::
+                                      parse_from_line_fn_t* parse_from_line) {
   bool success = true;
-  while (c != '\0' && pos < (int)(sizeof(token)-1)) {
-    if (c == '\n') {
-      token[pos++] = '\0';
-      if (!parse_line(token)) {
-        success = false;
-      }
-      pos = 0;
-    } else {
-      token[pos++] = c;
+  for (inputStream in(input); !in.done(); in.next()) {
+    if (!parse_from_line(in.current_line())) {
+      success = false;
     }
-    c = *sp++;
-  }
-  token[pos++] = '\0';
-  if (!parse_line(token)) {
-    success = false;
   }
   return success;
 }
 
+bool CompilerOracle::parse_from_string(const char* str,
+                                       CompilerOracle::
+                                       parse_from_line_fn_t* parse_from_line) {
+  MemoryInput input(str, strlen(str));
+  return parse_from_input(&input, parse_from_line);
+}
+
 bool compilerOracle_init() {
   bool success = true;
+  // Register default compile commands first - any commands specified via CompileCommand will
+  // supersede these default commands.
+  for (int i = 0; default_compile_commands[i] != nullptr; i ++) {
+    char* s = os::strdup(default_compile_commands[i]);
+    success = CompilerOracle::parse_from_line_quietly(s);
+    os::free(s);
+    assert(success, "default compile command \"%s\" failed to parse", default_compile_commands[i]);
+  }
   if (!CompilerOracle::parse_from_string(CompileCommand, CompilerOracle::parse_from_line)) {
     success = false;
   }
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 43a30b30facec..1a85e0629f93e 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -27,6 +27,7 @@
 
 #include "memory/allStatic.hpp"
 #include "oops/oopsHierarchy.hpp"
+#include "utilities/istream.hpp"
 
 class methodHandle;
 
@@ -120,11 +121,18 @@ enum class MemStatAction {
 };
 
 class CompilerOracle : AllStatic {
+ public:
+  typedef bool parse_from_line_fn_t(char*);
+
  private:
   static bool _quiet;
   static void print_parse_error(char* error_msg, char* original_line);
   static void print_command(CompileCommandEnum option, const char* name, enum OptionType type);
 
+  // The core parser.
+  static bool parse_from_input(inputStream::Input* input,
+                               parse_from_line_fn_t* parse_from_line);
+
  public:
   // True if the command file has been specified or is implicit
   static bool has_command_file();
@@ -177,8 +185,10 @@ class CompilerOracle : AllStatic {
   static bool option_matches_type(CompileCommandEnum option, T& value);
 
   // Reads from string instead of file
-  static bool parse_from_string(const char* option_string, bool (*parser)(char*));
+  static bool parse_from_string(const char* option_string,
+                                parse_from_line_fn_t* parser);
   static bool parse_from_line(char* line);
+  static bool parse_from_line_quietly(char* line);
   static bool parse_compile_only(char* line);
 
   // Fast check if there is any option set that compile control needs to know about
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
index dd38d33b5d39e..531559545d797 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -26,7 +26,6 @@
 #define SHARE_GC_G1_G1COLLECTIONSETCANDIDATES_HPP
 
 #include "gc/g1/g1CollectionSetCandidates.hpp"
-#include "gc/g1/g1_globals.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "memory/allocation.hpp"
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
index a176b847eab69..ba309c97ca5a3 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionManager.inline.hpp"
-#include "gc/g1/g1_globals.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
index 337acfe24058d..59a1afe6f3408 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -29,9 +29,8 @@
 #include "gc/g1/g1HeapRegionRemSet.hpp"
 #include "gc/g1/g1MonotonicArenaFreeMemoryTask.hpp"
 #include "gc/g1/g1MonotonicArenaFreePool.hpp"
-#include "gc/g1/g1_globals.hpp"
-#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "runtime/os.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
index 72f7a0b84e7d9..3f8f8e22a9965 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -29,9 +29,9 @@
 #include "gc/g1/g1RedirtyCardsQueue.hpp"
 #include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
-#include "gc/g1/g1_globals.hpp"
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/partialArrayTaskStepper.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index a47fd379a7038..63f48a15e8d4c 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -42,10 +42,10 @@
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RemSet.hpp"
-#include "gc/g1/g1_globals.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/bufferNodeList.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index bf1c8b738f8a0..720cf3a362916 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -49,10 +49,10 @@
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
 #include "gc/g1/g1YoungGCPostEvacuateTasks.hpp"
 #include "gc/g1/g1YoungGCPreEvacuateTasks.hpp"
-#include "gc/g1/g1_globals.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
index 60b7e0872f2ef..9bbb6bddb316a 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,7 +26,7 @@
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp"
-#include "gc/g1/g1_globals.hpp"
+#include "gc/shared/gc_globals.hpp"
 
 #if ALLOCATION_FAILURE_INJECTOR
 
diff --git a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.hpp b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.hpp
index fb7e8cd3ad3bb..44677fe4710bb 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_G1_G1YOUNGGCALLOCATIONFAILUREINJECTOR_HPP
 #define SHARE_GC_G1_G1YOUNGGCALLOCATIONFAILUREINJECTOR_HPP
 
-#include "gc/g1/g1_globals.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/allStatic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp
index 7c71eb14d52bc..cfa047ea0ce28 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,8 +27,8 @@
 
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
 
-#include "gc/g1/g1_globals.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 
 #if ALLOCATION_FAILURE_INJECTOR
 
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index 2a39ce7b4700d..b4ea195518201 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -79,10 +79,7 @@ void MutableNUMASpace::mangle_unused_area() {
   // This method should do nothing.
   // It can be called on a numa space during a full compaction.
 }
-void MutableNUMASpace::mangle_unused_area_complete() {
-  // This method should do nothing.
-  // It can be called on a numa space during a full compaction.
-}
+
 void MutableNUMASpace::mangle_region(MemRegion mr) {
   // This method should do nothing because numa spaces are not mangled.
 }
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
index 18271fabd050d..9a6cf420c0d24 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
@@ -173,7 +173,7 @@ class MutableNUMASpace : public MutableSpace {
 
   virtual void clear(bool mangle_space);
   virtual void mangle_unused_area() PRODUCT_RETURN;
-  virtual void mangle_unused_area_complete() PRODUCT_RETURN;
+
   virtual void mangle_region(MemRegion mr) PRODUCT_RETURN;
   virtual void check_mangled_unused_area(HeapWord* limit) PRODUCT_RETURN;
   virtual void check_mangled_unused_area_complete() PRODUCT_RETURN;
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 4641b4ce5c611..7d881f73dbf3e 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -167,10 +167,6 @@ void MutableSpace::mangle_unused_area() {
   mangler()->mangle_unused_area();
 }
 
-void MutableSpace::mangle_unused_area_complete() {
-  mangler()->mangle_unused_area_complete();
-}
-
 void MutableSpace::mangle_region(MemRegion mr) {
   SpaceMangler::mangle_region(mr);
 }
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index b77c1d80332e7..1cf0d306dc02e 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -109,7 +109,7 @@ class MutableSpace: public CHeapObj<mtGC> {
 
   // Methods used in mangling.  See descriptions under SpaceMangler.
   virtual void mangle_unused_area() PRODUCT_RETURN;
-  virtual void mangle_unused_area_complete() PRODUCT_RETURN;
+
   virtual void check_mangled_unused_area(HeapWord* limit) PRODUCT_RETURN;
   virtual void check_mangled_unused_area_complete() PRODUCT_RETURN;
   virtual void set_top_for_allocations(HeapWord* v) PRODUCT_RETURN;
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 43c8be36148cf..ff65a6dd45033 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -226,6 +226,7 @@ DefNewGeneration::DefNewGeneration(ReservedSpace rs,
                                    size_t max_size,
                                    const char* policy)
   : Generation(rs, initial_size),
+    _promotion_failed(false),
     _preserved_marks_set(false /* in_c_heap */),
     _promo_failure_drain_in_progress(false),
     _should_allocate_from_space(false),
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 6fbe6d708972b..b413e3dfb438c 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -91,9 +91,7 @@ class CollectedHeap : public CHeapObj<mtGC> {
   friend class VMStructs;
   friend class JVMCIVMStructs;
   friend class IsSTWGCActiveMark; // Block structured external access to _is_stw_gc_active
-  friend class DisableIsSTWGCActiveMark; // Disable current IsSTWGCActiveMark
   friend class MemAllocator;
-  friend class ParallelObjectIterator;
 
  private:
   GCHeapLog* _gc_heap_log;
@@ -401,12 +399,10 @@ class CollectedHeap : public CHeapObj<mtGC> {
   // Iterate over all objects, calling "cl.do_object" on each.
   virtual void object_iterate(ObjectClosure* cl) = 0;
 
- protected:
   virtual ParallelObjectIteratorImpl* parallel_object_iterator(uint thread_num) {
     return nullptr;
   }
 
- public:
   // Keep alive an object that was loaded with AS_NO_KEEPALIVE.
   virtual void keep_alive(oop obj) {}
 
diff --git a/src/hotspot/share/gc/shared/isGCActiveMark.cpp b/src/hotspot/share/gc/shared/isGCActiveMark.cpp
index add6acaa01a22..7c400f2acc082 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.cpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.cpp
@@ -42,15 +42,3 @@ IsSTWGCActiveMark::~IsSTWGCActiveMark() {
   assert(heap->is_stw_gc_active(), "Sanity");
   heap->_is_stw_gc_active = false;
 }
-
-DisableIsSTWGCActiveMark::DisableIsSTWGCActiveMark() {
-  CollectedHeap* heap = Universe::heap();
-  assert(heap->is_stw_gc_active(), "Not reentrant");
-  heap->_is_stw_gc_active = false;
-}
-
-DisableIsSTWGCActiveMark::~DisableIsSTWGCActiveMark() {
-  CollectedHeap* heap = Universe::heap();
-  assert(!heap->is_stw_gc_active(), "Sanity");
-  heap->_is_stw_gc_active = true;
-}
diff --git a/src/hotspot/share/gc/shared/isGCActiveMark.hpp b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
index c65c7ebe56a68..e523c600ace5c 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.hpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
@@ -36,10 +36,4 @@ class IsSTWGCActiveMark : public StackObj {
   ~IsSTWGCActiveMark();
 };
 
-class DisableIsSTWGCActiveMark : public StackObj {
- public:
-  DisableIsSTWGCActiveMark();
-  ~DisableIsSTWGCActiveMark();
-};
-
 #endif // SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index ddd33d8f43adb..156b55c104621 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -123,21 +123,21 @@ bool MemAllocator::Allocation::check_out_of_memory() {
   }
 
   const char* message = _overhead_limit_exceeded ? "GC overhead limit exceeded" : "Java heap space";
-  if (!_thread->in_retryable_allocation()) {
+  if (!_thread->is_in_internal_oome_mark()) {
     // -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError support
     report_java_out_of_memory(message);
-
     if (JvmtiExport::should_post_resource_exhausted()) {
       JvmtiExport::post_resource_exhausted(
         JVMTI_RESOURCE_EXHAUSTED_OOM_ERROR | JVMTI_RESOURCE_EXHAUSTED_JAVA_HEAP,
         message);
     }
+
     oop exception = _overhead_limit_exceeded ?
         Universe::out_of_memory_error_gc_overhead_limit() :
         Universe::out_of_memory_error_java_heap();
     THROW_OOP_(exception, true);
   } else {
-    THROW_OOP_(Universe::out_of_memory_error_retry(), true);
+    THROW_OOP_(Universe::out_of_memory_error_java_heap_without_backtrace(), true);
   }
 }
 
diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp
index 5d3f892ca14fd..f299dd633e510 100644
--- a/src/hotspot/share/gc/shared/memAllocator.hpp
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp
@@ -114,4 +114,37 @@ class ClassAllocator: public MemAllocator {
   virtual oop initialize(HeapWord* mem) const;
 };
 
+// Manages a scope where a failed heap allocation results in
+// suppression of JVMTI "resource exhausted" events and
+// throwing a shared, backtrace-less OOME instance.
+// Used for OOMEs that will not be propagated to user code.
+class InternalOOMEMark: public StackObj {
+ private:
+  bool _outer;
+  JavaThread* _thread;
+
+ public:
+  explicit InternalOOMEMark(JavaThread* thread) {
+    if (thread != nullptr) {
+      _outer = thread->is_in_internal_oome_mark();
+      thread->set_is_in_internal_oome_mark(true);
+      _thread = thread;
+    } else {
+      _outer = false;
+      _thread = nullptr;
+    }
+  }
+
+  ~InternalOOMEMark() {
+    if (_thread != nullptr) {
+      // Check that only InternalOOMEMark sets
+      // JavaThread::_is_in_internal_oome_mark
+      assert(_thread->is_in_internal_oome_mark(), "must be");
+      _thread->set_is_in_internal_oome_mark(_outer);
+    }
+  }
+
+  JavaThread* thread() const  { return _thread; }
+};
+
 #endif // SHARE_GC_SHARED_MEMALLOCATOR_HPP
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 2a831ddad89bc..8dcd954dcf479 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -73,8 +73,11 @@ class ContiguousSpace: public CHeapObj<mtGC> {
   // Accessors
   HeapWord* bottom() const         { return _bottom; }
   HeapWord* end() const            { return _end;    }
+  HeapWord* top() const            { return _top;    }
+
   void set_bottom(HeapWord* value) { _bottom = value; }
   void set_end(HeapWord* value)    { _end = value; }
+  void set_top(HeapWord* value)    { _top = value; }
 
   // Testers
   bool is_empty() const              { return used() == 0; }
@@ -112,10 +115,6 @@ class ContiguousSpace: public CHeapObj<mtGC> {
   // had allocation performed in it, but is now to be considered empty.
   void clear(bool mangle_space);
 
-  // Accessors
-  HeapWord* top() const            { return _top;    }
-  void set_top(HeapWord* value)    { _top = value; }
-
   // Used to save the space's current top for later use during mangling.
   void set_top_for_allocations() PRODUCT_RETURN;
 
@@ -139,9 +138,9 @@ class ContiguousSpace: public CHeapObj<mtGC> {
 
   // Allocation (return null if full).  Assumes the caller has established
   // mutually exclusive access to the space.
-  virtual HeapWord* allocate(size_t word_size);
+  HeapWord* allocate(size_t word_size);
   // Allocation (return null if full).  Enforces mutual exclusion internally.
-  virtual HeapWord* par_allocate(size_t word_size);
+  HeapWord* par_allocate(size_t word_size);
 
   // Iteration
   void object_iterate(ObjectClosure* blk);
diff --git a/src/hotspot/share/gc/z/zArray.inline.hpp b/src/hotspot/share/gc/z/zArray.inline.hpp
index e4de7a37040da..2ec87a761564e 100644
--- a/src/hotspot/share/gc/z/zArray.inline.hpp
+++ b/src/hotspot/share/gc/z/zArray.inline.hpp
@@ -96,7 +96,7 @@ ZActivatedArray<T>::ZActivatedArray(bool locked)
     _array() {}
 
 template <typename T>
-ZActivatedArray<T>::~ZActivatedArray<T>() {
+ZActivatedArray<T>::~ZActivatedArray() {
   FreeHeap(_lock);
 }
 
diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index d8f78eb26e211..fba8adfb3c16f 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -483,9 +483,6 @@ void ZVerify::after_mark() {
     roots_strong(true /* verify_after_old_mark */);
   }
   if (ZVerifyObjects) {
-    // Workaround OopMapCacheAlloc_lock reordering with the StackWatermark_lock
-    DisableIsSTWGCActiveMark mark;
-
     objects(false /* verify_weaks */);
     guarantee(zverify_broken_object == zaddress::null, "Verification failed");
   }
diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
index 9627259e26473..57b29a09d016f 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -248,12 +248,6 @@ bool ReferenceToThreadRootClosure::do_thread_stack_detailed(JavaThread* jt) {
   ReferenceLocateClosure rcl(_callback, OldObjectRoot::_threads, OldObjectRoot::_stack_variable, jt);
 
   if (jt->has_last_Java_frame()) {
-    // Traverse the monitor chunks
-    MonitorChunk* chunk = jt->monitor_chunks();
-    for (; chunk != nullptr; chunk = chunk->next()) {
-      chunk->oops_do(&rcl);
-    }
-
     if (rcl.complete()) {
       return true;
     }
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index fc4bb5a6a0674..99f427ee1688d 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -28,6 +28,7 @@
 #include "classfile/vmClasses.hpp"
 #include "compiler/compileBroker.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/memAllocator.hpp"
 #include "gc/shared/oopStorage.inline.hpp"
 #include "jvmci/jniAccessMark.inline.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
@@ -92,39 +93,25 @@ static void deopt_caller() {
 }
 
 // Manages a scope for a JVMCI runtime call that attempts a heap allocation.
-// If there is a pending nonasync exception upon closing the scope and the runtime
+// If there is a pending OutOfMemoryError upon closing the scope and the runtime
 // call is of the variety where allocation failure returns null without an
 // exception, the following action is taken:
-//   1. The pending nonasync exception is cleared
+//   1. The pending OutOfMemoryError is cleared
 //   2. null is written to JavaThread::_vm_result
-//   3. Checks that an OutOfMemoryError is Universe::out_of_memory_error_retry().
-class RetryableAllocationMark: public StackObj {
+class RetryableAllocationMark {
  private:
-  JavaThread* _thread;
+   InternalOOMEMark _iom;
  public:
-  RetryableAllocationMark(JavaThread* thread, bool activate) {
-    if (activate) {
-      assert(!thread->in_retryable_allocation(), "retryable allocation scope is non-reentrant");
-      _thread = thread;
-      _thread->set_in_retryable_allocation(true);
-    } else {
-      _thread = nullptr;
-    }
-  }
+  RetryableAllocationMark(JavaThread* thread, bool activate) : _iom(activate ? thread : nullptr) {}
   ~RetryableAllocationMark() {
-    if (_thread != nullptr) {
-      _thread->set_in_retryable_allocation(false);
-      JavaThread* THREAD = _thread; // For exception macros.
+    JavaThread* THREAD = _iom.thread(); // For exception macros.
+    if (THREAD != nullptr) {
       if (HAS_PENDING_EXCEPTION) {
         oop ex = PENDING_EXCEPTION;
-        // Do not clear probable async exceptions.
-        CLEAR_PENDING_NONASYNC_EXCEPTION;
-        oop retry_oome = Universe::out_of_memory_error_retry();
-        if (ex->is_a(retry_oome->klass()) && retry_oome != ex) {
-          ResourceMark rm;
-          fatal("Unexpected exception in scope of retryable allocation: " INTPTR_FORMAT " of type %s", p2i(ex), ex->klass()->external_name());
+        THREAD->set_vm_result(nullptr);
+        if (ex->is_a(vmClasses::OutOfMemoryError_klass())) {
+          CLEAR_PENDING_EXCEPTION;
         }
-        _thread->set_vm_result(nullptr);
       }
     }
   }
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 187bdf25af85a..4a16b3d89a878 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -135,7 +135,6 @@ enum OutOfMemoryInstance { _oom_java_heap,
                            _oom_array_size,
                            _oom_gc_overhead_limit,
                            _oom_realloc_objects,
-                           _oom_retry,
                            _oom_count };
 
 OopHandle Universe::_out_of_memory_errors;
@@ -655,6 +654,10 @@ oop Universe::out_of_memory_error_java_heap() {
   return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_java_heap));
 }
 
+oop Universe::out_of_memory_error_java_heap_without_backtrace() {
+  return out_of_memory_errors()->obj_at(_oom_java_heap);
+}
+
 oop Universe::out_of_memory_error_c_heap() {
   return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_c_heap));
 }
@@ -679,9 +682,6 @@ oop Universe::out_of_memory_error_realloc_objects() {
   return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_realloc_objects));
 }
 
-// Throw default _out_of_memory_error_retry object as it will never propagate out of the VM
-oop Universe::out_of_memory_error_retry()              { return out_of_memory_errors()->obj_at(_oom_retry);  }
-
 oop Universe::class_init_out_of_memory_error()         { return out_of_memory_errors()->obj_at(_oom_java_heap); }
 oop Universe::class_init_stack_overflow_error()        { return _class_init_stack_overflow_error.resolve(); }
 oop Universe::delayed_stack_overflow_error_message()   { return _delayed_stack_overflow_error_message.resolve(); }
@@ -785,9 +785,6 @@ void Universe::create_preallocated_out_of_memory_errors(TRAPS) {
   msg = java_lang_String::create_from_str("Java heap space: failed reallocation of scalar replaced objects", CHECK);
   java_lang_Throwable::set_message(oom_array->obj_at(_oom_realloc_objects), msg());
 
-  msg = java_lang_String::create_from_str("Java heap space: failed retryable allocation", CHECK);
-  java_lang_Throwable::set_message(oom_array->obj_at(_oom_retry), msg());
-
   // Setup the array of errors that have preallocated backtrace
   int len = (StackTraceInThrowable) ? (int)PreallocatedOutOfMemoryErrorCount : 0;
   objArrayOop instance = oopFactory::new_objArray(ik, len, CHECK);
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index d5a38658e482f..c7bdb8f233970 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -272,6 +272,7 @@ class Universe: AllStatic {
   // may or may not have a backtrace. If error has a backtrace then the stack trace is already
   // filled in.
   static oop out_of_memory_error_java_heap();
+  static oop out_of_memory_error_java_heap_without_backtrace();
   static oop out_of_memory_error_c_heap();
   static oop out_of_memory_error_metaspace();
   static oop out_of_memory_error_class_metaspace();
@@ -279,8 +280,6 @@ class Universe: AllStatic {
   static oop out_of_memory_error_gc_overhead_limit();
   static oop out_of_memory_error_realloc_objects();
 
-  // Throw default _out_of_memory_error_retry object as it will never propagate out of the VM
-  static oop out_of_memory_error_retry();
   static oop delayed_stack_overflow_error_message();
 
   // Saved StackOverflowError and OutOfMemoryError for use when
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 23a6770251a3d..ea3b5e756d082 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -873,12 +873,12 @@ void Klass::set_archived_java_mirror(int mirror_index) {
 
 void Klass::check_array_allocation_length(int length, int max_length, TRAPS) {
   if (length > max_length) {
-    if (!THREAD->in_retryable_allocation()) {
+    if (!THREAD->is_in_internal_oome_mark()) {
       report_java_out_of_memory("Requested array size exceeds VM limit");
       JvmtiExport::post_array_size_exhausted();
       THROW_OOP(Universe::out_of_memory_error_array_size());
     } else {
-      THROW_OOP(Universe::out_of_memory_error_retry());
+      THROW_OOP(Universe::out_of_memory_error_java_heap_without_backtrace());
     }
   } else if (length < 0) {
     THROW_MSG(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index d5ed95187a893..25c7ced8aebfe 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -844,19 +844,9 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci,
   if (failing())  return;
   NOT_PRODUCT( verify_graph_edges(); )
 
-  // If any phase is randomized for stress testing, seed random number
-  // generation and log the seed for repeatability.
   if (StressLCM || StressGCM || StressIGVN || StressCCP ||
       StressIncrementalInlining || StressMacroExpansion) {
-    if (FLAG_IS_DEFAULT(StressSeed) || (FLAG_IS_ERGO(StressSeed) && directive->RepeatCompilationOption)) {
-      _stress_seed = static_cast<uint>(Ticks::now().nanoseconds());
-      FLAG_SET_ERGO(StressSeed, _stress_seed);
-    } else {
-      _stress_seed = StressSeed;
-    }
-    if (_log != nullptr) {
-      _log->elem("stress_test seed='%u'", _stress_seed);
-    }
+    initialize_stress_seed(directive);
   }
 
   // Now optimize
@@ -983,6 +973,11 @@ Compile::Compile( ciEnv* ci_env,
   _igvn_worklist = new (comp_arena()) Unique_Node_List(comp_arena());
   _types = new (comp_arena()) Type_Array(comp_arena());
   _node_hash = new (comp_arena()) NodeHash(comp_arena(), 255);
+
+  if (StressLCM || StressGCM) {
+    initialize_stress_seed(directive);
+  }
+
   {
     PhaseGVN gvn;
     set_initial_gvn(&gvn);    // not significant, but GraphKit guys use it pervasively
@@ -5068,6 +5063,18 @@ void Compile::remove_speculative_types(PhaseIterGVN &igvn) {
 
 // Auxiliary methods to support randomized stressing/fuzzing.
 
+void Compile::initialize_stress_seed(const DirectiveSet* directive) {
+  if (FLAG_IS_DEFAULT(StressSeed) || (FLAG_IS_ERGO(StressSeed) && directive->RepeatCompilationOption)) {
+    _stress_seed = static_cast<uint>(Ticks::now().nanoseconds());
+    FLAG_SET_ERGO(StressSeed, _stress_seed);
+  } else {
+    _stress_seed = StressSeed;
+  }
+  if (_log != nullptr) {
+    _log->elem("stress_test seed='%u'", _stress_seed);
+  }
+}
+
 int Compile::random() {
   _stress_seed = os::next_random(_stress_seed);
   return static_cast<int>(_stress_seed);
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index df93b388daa8d..e1d9b61f7f8d1 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -1278,6 +1278,9 @@ class Compile : public Phase {
   int random();
   bool randomized_select(int count);
 
+  // seed random number generation and log the seed for repeatability.
+  void initialize_stress_seed(const DirectiveSet* directive);
+
   // supporting clone_map
   CloneMap&     clone_map();
   void          set_clone_map(Dict* d);
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index c82eaad50e1ba..71051ee7bd10a 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -2184,7 +2184,8 @@ void ConnectionGraph::process_call_arguments(CallNode *call) {
                   strcmp(call->as_CallLeaf()->_name, "vectorizedMismatch") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "arraysort_stub") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "array_partition_stub") == 0 ||
-                  strcmp(call->as_CallLeaf()->_name, "get_class_id_intrinsic") == 0)
+                  strcmp(call->as_CallLeaf()->_name, "get_class_id_intrinsic") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "unsafe_setmemory") == 0)
                  ))) {
             call->dump();
             fatal("EA unexpected CallLeaf %s", call->as_CallLeaf()->_name);
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index bb58c2ff8cee6..04631dcbae237 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1569,8 +1569,8 @@ Node* Node::last_out(DUIterator_Last& i) const {
 class SimpleDUIterator : public StackObj {
  private:
   Node* node;
-  DUIterator_Fast i;
   DUIterator_Fast imax;
+  DUIterator_Fast i;
  public:
   SimpleDUIterator(Node* n): node(n), i(n->fast_outs(imax)) {}
   bool has_next() { return i < imax; }
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 4d623144a8407..3f48567c09363 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -1280,7 +1280,6 @@ void PhaseOutput::estimate_buffer_size(int& const_req) {
   }
 
   // Compute prolog code size
-  _method_size = 0;
   _frame_slots = OptoReg::reg2stack(C->matcher()->_old_SP) + C->regalloc()->_framesize;
   assert(_frame_slots >= 0 && _frame_slots < 1000000, "sanity check");
 
diff --git a/src/hotspot/share/opto/output.hpp b/src/hotspot/share/opto/output.hpp
index b58b97e77455e..1717955360256 100644
--- a/src/hotspot/share/opto/output.hpp
+++ b/src/hotspot/share/opto/output.hpp
@@ -77,7 +77,6 @@ class BufferSizingData {
 class PhaseOutput : public Phase {
 private:
   // Instruction bits passed off to the VM
-  int                    _method_size;           // Size of nmethod code segment in bytes
   CodeBuffer             _code_buffer;           // Where the code is assembled
   int                    _first_block_size;      // Size of unvalidated entry point code / OSR poison code
   ExceptionHandlerTable  _handler_table;         // Table of native-code exception handlers
@@ -166,7 +165,6 @@ class PhaseOutput : public Phase {
   void install();
 
   // Instruction bits passed off to the VM
-  int               code_size()                 { return _method_size; }
   CodeBuffer*       code_buffer()               { return &_code_buffer; }
   int               first_block_size()          { return _first_block_size; }
   void              set_frame_complete(int off) { if (!in_scratch_emit_size()) { _code_offsets.set_value(CodeOffsets::Frame_Complete, off); } }
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index cd9b76eb44db9..f41e8a7b8b354 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -45,12 +45,13 @@ SuperWord::SuperWord(const VLoopAnalyzer &vloop_analyzer) :
   _arena(mtCompiler),
   _node_info(arena(), _vloop.estimated_body_length(), 0, SWNodeInfo::initial), // info needed per node
   _clone_map(phase()->C->clone_map()),                      // map of nodes created in cloning
-  _align_to_ref(nullptr),                                   // memory reference to align vectors to
   _pairset(&_arena, _vloop_analyzer),
   _packset(&_arena, _vloop_analyzer
            NOT_PRODUCT(COMMA is_trace_superword_packset())
            NOT_PRODUCT(COMMA is_trace_superword_rejections())
            ),
+  _mem_ref_for_main_loop_alignment(nullptr),
+  _aw_for_main_loop_alignment(0),
   _do_vector_loop(phase()->C->do_vector_loop()),            // whether to do vectorization/simd style
   _num_work_vecs(0),                                        // amount of vector work we have
   _num_reductions(0)                                        // amount of reduction work we have
@@ -516,22 +517,12 @@ void SuperWord::find_adjacent_refs() {
 
   int max_idx;
 
-  // Take the first mem_ref as the reference to align to. The pre-loop trip count is
-  // modified to align this reference to a vector-aligned address. If strict alignment
-  // is required, we may change the reference later (see filter_packs_for_alignment()).
-  MemNode* align_to_mem_ref = nullptr;
-
   while (memops.size() != 0) {
     // Find a memory reference to align to.
     MemNode* mem_ref = find_align_to_ref(memops, max_idx);
     if (mem_ref == nullptr) break;
     int iv_adjustment = get_iv_adjustment(mem_ref);
 
-    if (align_to_mem_ref == nullptr) {
-      align_to_mem_ref = mem_ref;
-      set_align_to_ref(align_to_mem_ref);
-    }
-
     const VPointer& align_to_ref_p = vpointer(mem_ref);
     // Set alignment relative to "align_to_ref" for all related memory operations.
     for (int i = memops.size() - 1; i >= 0; i--) {
@@ -573,9 +564,6 @@ void SuperWord::find_adjacent_refs() {
     }
   } // while (memops.size() != 0)
 
-  assert(_pairset.is_empty() || align_to_mem_ref != nullptr,
-         "pairset empty or we find the alignment reference");
-
 #ifndef PRODUCT
   if (is_trace_superword_packset()) {
     tty->print_cr("\nAfter Superword::find_adjacent_refs");
@@ -1723,7 +1711,11 @@ void SuperWord::filter_packs_for_alignment() {
   if (current->is_constrained()) {
     // Solution is constrained (not trivial)
     // -> must change pre-limit to achieve alignment
-    set_align_to_ref(current->as_constrained()->mem_ref());
+    MemNode const* mem = current->as_constrained()->mem_ref();
+    Node_List* pack = get_pack(mem);
+    assert(pack != nullptr, "memop of final solution must still be packed");
+    _mem_ref_for_main_loop_alignment = mem;
+    _aw_for_main_loop_alignment = pack->size() * mem->memory_size();
   }
 }
 
@@ -3397,6 +3389,32 @@ LoadNode::ControlDependency SuperWord::control_dependency(Node_List* p) {
   return dep;
 }
 
+// Find the memop pack with the maximum vector width, unless they were already
+// determined by SuperWord::filter_packs_for_alignment().
+void SuperWord::determine_mem_ref_and_aw_for_main_loop_alignment() {
+  if (_mem_ref_for_main_loop_alignment != nullptr) {
+    assert(vectors_should_be_aligned(), "mem_ref only set if filtered for alignment");
+    return;
+  }
+
+  MemNode const* mem_ref = nullptr;
+  int max_aw = 0;
+  for (int i = 0; i < _packset.length(); i++) {
+    Node_List* pack = _packset.at(i);
+    MemNode* first = pack->at(0)->isa_Mem();
+    if (first == nullptr) { continue; }
+
+    int vw = first->memory_size() * pack->size();
+    if (vw > max_aw) {
+      max_aw = vw;
+      mem_ref = first;
+    }
+  }
+  assert(mem_ref != nullptr && max_aw > 0, "found mem_ref and aw");
+  _mem_ref_for_main_loop_alignment = mem_ref;
+  _aw_for_main_loop_alignment = max_aw;
+}
+
 #define TRACE_ALIGN_VECTOR_NODE(node) { \
   DEBUG_ONLY(                           \
     if (is_trace_align_vector()) {      \
@@ -3407,11 +3425,14 @@ LoadNode::ControlDependency SuperWord::control_dependency(Node_List* p) {
 }                                       \
 
 // Ensure that the main loop vectors are aligned by adjusting the pre loop limit. We memory-align
-// the address of "align_to_ref" to the maximal possible vector width. We adjust the pre-loop
-// iteration count by adjusting the pre-loop limit.
+// the address of "_mem_ref_for_main_loop_alignment" to "_aw_for_main_loop_alignment", which is a
+// sufficiently large alignment width. We adjust the pre-loop iteration count by adjusting the
+// pre-loop limit.
 void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
-  const MemNode* align_to_ref = _align_to_ref;
-  assert(align_to_ref != nullptr, "align_to_ref must be set");
+  determine_mem_ref_and_aw_for_main_loop_alignment();
+  const MemNode* align_to_ref = _mem_ref_for_main_loop_alignment;
+  const int aw                = _aw_for_main_loop_alignment;
+  assert(align_to_ref != nullptr && aw > 0, "must have alignment reference and aw");
   assert(cl()->is_main_loop(), "can only do alignment for main loop");
 
   // The opaque node for the limit, where we adjust the input
@@ -3556,10 +3577,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   //                   = MIN(new_limit,                   orig_limit)         (15a, stride > 0)
   // constrained_limit = MAX(old_limit - adjust_pre_iter, orig_limit)
   //                   = MAX(new_limit,                   orig_limit)         (15a, stride < 0)
-
-  // We chose an aw that is the maximal possible vector width for the type of
-  // align_to_ref.
-  const int aw       = vector_width_in_bytes(align_to_ref);
+  //
   const int stride   = iv_stride();
   const int scale    = align_to_ref_p.scale_in_bytes();
   const int offset   = align_to_ref_p.offset_in_bytes();
diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp
index 7d1ba1131f322..159032d94b909 100644
--- a/src/hotspot/share/opto/superword.hpp
+++ b/src/hotspot/share/opto/superword.hpp
@@ -411,11 +411,15 @@ class SuperWord : public ResourceObj {
 
   GrowableArray<SWNodeInfo> _node_info;  // Info needed per node
   CloneMap&            _clone_map;       // map of nodes created in cloning
-  MemNode const* _align_to_ref;          // Memory reference that pre-loop will align to
 
   PairSet _pairset;
   PackSet _packset;
 
+  // Memory reference, and the alignment width (aw) for which we align the main-loop,
+  // by adjusting the pre-loop limit.
+  MemNode const* _mem_ref_for_main_loop_alignment;
+  int _aw_for_main_loop_alignment;
+
  public:
   SuperWord(const VLoopAnalyzer &vloop_analyzer);
 
@@ -563,8 +567,6 @@ class SuperWord : public ResourceObj {
   Arena* arena()                   { return &_arena; }
 
   int get_vw_bytes_special(MemNode* s);
-  const MemNode* align_to_ref() const { return _align_to_ref; }
-  void set_align_to_ref(const MemNode* m) { _align_to_ref = m; }
 
   // Ensure node_info contains element "i"
   void grow_node_info(int i) { if (i >= _node_info.length()) _node_info.at_put_grow(i, SWNodeInfo::initial); }
@@ -670,6 +672,7 @@ class SuperWord : public ResourceObj {
   // Alignment within a vector memory reference
   int memory_alignment(MemNode* s, int iv_adjust);
   // Ensure that the main loop vectors are aligned by adjusting the pre loop limit.
+  void determine_mem_ref_and_aw_for_main_loop_alignment();
   void adjust_pre_loop_limit_to_align_main_loop_vectors();
 };
 
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 2039e9c27be74..807912327e6d1 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -59,6 +59,17 @@ static bool check_vbox(const TypeInstPtr* vbox_type) {
 }
 #endif
 
+#define log_if_needed(...)        \
+  if (C->print_intrinsics()) {    \
+    tty->print_cr(__VA_ARGS__);   \
+  }
+
+#ifndef PRODUCT
+#define non_product_log_if_needed(...) log_if_needed(__VA_ARGS__)
+#else
+#define non_product_log_if_needed(...)
+#endif
+
 static bool is_vector_mask(ciKlass* klass) {
   return klass->is_subclass_of(ciEnv::current()->vector_VectorMask_klass());
 }
@@ -85,12 +96,8 @@ bool LibraryCallKit::arch_supports_vector_rotate(int opc, int num_elem, BasicTyp
     if ((mask_use_type & VecMaskUseLoad) != 0) {
       if (!Matcher::match_rule_supported_vector(Op_VectorLoadMask, num_elem, elem_bt) ||
           !Matcher::match_rule_supported_vector(Op_LoadVector, num_elem, T_BOOLEAN)) {
-      #ifndef PRODUCT
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** Rejected vector mask loading (%s,%s,%d) because architecture does not support it",
-                        NodeClassNames[Op_VectorLoadMask], type2name(elem_bt), num_elem);
-        }
-      #endif
+        non_product_log_if_needed("  ** Rejected vector mask loading (%s,%s,%d) because architecture does not support it",
+                                  NodeClassNames[Op_VectorLoadMask], type2name(elem_bt), num_elem);
         return false;
       }
     }
@@ -98,12 +105,8 @@ bool LibraryCallKit::arch_supports_vector_rotate(int opc, int num_elem, BasicTyp
     if ((mask_use_type & VecMaskUsePred) != 0) {
       if (!Matcher::has_predicated_vectors() ||
           !Matcher::match_rule_supported_vector_masked(opc, num_elem, elem_bt)) {
-      #ifndef PRODUCT
-        if (C->print_intrinsics()) {
-          tty->print_cr("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
-                        NodeClassNames[opc], type2name(elem_bt), num_elem);
-        }
-      #endif
+        non_product_log_if_needed("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
+                                  NodeClassNames[opc], type2name(elem_bt), num_elem);
         return false;
       }
     }
@@ -185,43 +188,27 @@ Node* GraphKit::vector_shift_count(Node* cnt, int shift_op, BasicType bt, int nu
 bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type, VectorMaskUseType mask_use_type, bool has_scalar_args) {
   // Check that the operation is valid.
   if (sopc <= 0) {
-#ifndef PRODUCT
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** Rejected intrinsification because no valid vector op could be extracted");
-    }
-#endif
+    non_product_log_if_needed("  ** Rejected intrinsification because no valid vector op could be extracted");
     return false;
   }
 
   if (VectorNode::is_vector_rotate(sopc)) {
     if(!arch_supports_vector_rotate(sopc, num_elem, type, mask_use_type, has_scalar_args)) {
-#ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-#endif
+      non_product_log_if_needed("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     }
   } else if (VectorNode::is_vector_integral_negate(sopc)) {
     if (!VectorNode::is_vector_integral_negate_supported(sopc, num_elem, type, false)) {
-#ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support integral vector negate",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-#endif
+      non_product_log_if_needed("  ** Rejected vector op (%s,%s,%d) because architecture does not support integral vector negate",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     }
   } else {
     // Check that architecture supports this op-size-type combination.
     if (!Matcher::match_rule_supported_vector(sopc, num_elem, type)) {
-#ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-#endif
+      non_product_log_if_needed("  ** Rejected vector op (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     } else {
       assert(Matcher::match_rule_supported(sopc), "must be supported");
@@ -230,23 +217,15 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
 
   if (num_elem == 1) {
     if (mask_use_type != VecMaskNotUsed) {
-#ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector mask op (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-#endif
+      non_product_log_if_needed("  ** Rejected vector mask op (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     }
 
     if (sopc != 0) {
       if (sopc != Op_LoadVector && sopc != Op_StoreVector) {
-#ifndef PRODUCT
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** Not a svml call or load/store vector op (%s,%s,%d)",
-                        NodeClassNames[sopc], type2name(type), num_elem);
-        }
-#endif
+        non_product_log_if_needed("  ** Not a svml call or load/store vector op (%s,%s,%d)",
+                                  NodeClassNames[sopc], type2name(type), num_elem);
         return false;
       }
     }
@@ -254,10 +233,8 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
 
   if (!has_scalar_args && VectorNode::is_vector_shift(sopc) &&
       Matcher::supports_vector_variable_shifts() == false) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
-                    NodeClassNames[sopc], type2name(type), num_elem);
-    }
+    log_if_needed("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
+                  NodeClassNames[sopc], type2name(type), num_elem);
     return false;
   }
 
@@ -267,12 +244,8 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
   if ((mask_use_type & VecMaskUseLoad) != 0) {
     if (!Matcher::match_rule_supported_vector(Op_VectorLoadMask, num_elem, type) ||
         !Matcher::match_rule_supported_vector(Op_LoadVector, num_elem, T_BOOLEAN)) {
-    #ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector mask loading (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[Op_VectorLoadMask], type2name(type), num_elem);
-      }
-    #endif
+      non_product_log_if_needed("  ** Rejected vector mask loading (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[Op_VectorLoadMask], type2name(type), num_elem);
       return false;
     }
   }
@@ -283,12 +256,8 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
   if ((mask_use_type & VecMaskUseStore) != 0) {
     if (!Matcher::match_rule_supported_vector(Op_VectorStoreMask, num_elem, type) ||
         !Matcher::match_rule_supported_vector(Op_StoreVector, num_elem, T_BOOLEAN)) {
-    #ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("Rejected vector mask storing (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[Op_VectorStoreMask], type2name(type), num_elem);
-      }
-    #endif
+      non_product_log_if_needed("Rejected vector mask storing (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[Op_VectorStoreMask], type2name(type), num_elem);
       return false;
     }
   }
@@ -305,12 +274,8 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
     is_supported |= Matcher::supports_vector_predicate_op_emulation(sopc, num_elem, type);
 
     if (!is_supported) {
-    #ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-    #endif
+      non_product_log_if_needed("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     }
   }
@@ -360,27 +325,21 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
 
   if (opr == nullptr || vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       !opr->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -390,23 +349,17 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
     if (mask_klass == nullptr || mask_klass->const_oop() == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     if (!is_klass_initialized(mask_klass)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** mask klass argument not initialized");
-      }
+      log_if_needed("  ** mask klass argument not initialized");
       return false;
     }
 
     if (vmask_type->maybe_null()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** null mask values are not allowed for masked op");
-      }
+      log_if_needed("  ** null mask values are not allowed for masked op");
       return false;
     }
   }
@@ -416,17 +369,13 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   int opc = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
   int sopc = VectorNode::opcode(opc, elem_bt);
   if ((opc != Op_CallLeafVector) && (sopc == 0)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
-    }
+    log_if_needed("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
     return false; // operation not supported
   }
   if (num_elem == 1) {
     if (opc != Op_CallLeafVector || elem_bt != T_DOUBLE) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not a svml call: arity=%d opc=%d vlen=%d etype=%s",
+      log_if_needed("  ** not a svml call: arity=%d opc=%d vlen=%d etype=%s",
                       n, opc, num_elem, type2name(elem_bt));
-      }
       return false;
     }
   }
@@ -439,22 +388,16 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
 
   if (opc == Op_CallLeafVector) {
     if (!UseVectorStubs) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** vector stubs support is disabled");
-      }
+      log_if_needed("  ** vector stubs support is disabled");
       return false;
     }
     if (!Matcher::supports_vector_calling_convention()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** no vector calling conventions supported");
-      }
+      log_if_needed("  ** no vector calling conventions supported");
       return false;
     }
     if (!Matcher::vector_size_supported(elem_bt, num_elem)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** vector size (vlen=%d, etype=%s) is not supported",
+      log_if_needed("  ** vector size (vlen=%d, etype=%s) is not supported",
                       num_elem, type2name(elem_bt));
-      }
       return false;
     }
   }
@@ -463,21 +406,17 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   VectorMaskUseType mask_use_type = is_vector_mask(vbox_klass) ? VecMaskUseAll
                                       : is_masked_op ? VecMaskUseLoad : VecMaskNotUsed;
   if ((sopc != 0) && !arch_supports_vector(sopc, num_elem, elem_bt, mask_use_type)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d opc=%d vlen=%d etype=%s ismask=%d is_masked_op=%d",
+    log_if_needed("  ** not supported: arity=%d opc=%d vlen=%d etype=%s ismask=%d is_masked_op=%d",
                     n, sopc, num_elem, type2name(elem_bt),
                     is_vector_mask(vbox_klass) ? 1 : 0, is_masked_op ? 1 : 0);
-    }
     return false; // not supported
   }
 
   // Return true if current platform has implemented the masked operation with predicate feature.
   bool use_predicate = is_masked_op && sopc != 0 && arch_supports_vector(sopc, num_elem, elem_bt, VecMaskUsePred);
   if (is_masked_op && !use_predicate && !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d opc=%d vlen=%d etype=%s ismask=0 is_masked_op=1",
+    log_if_needed("  ** not supported: arity=%d opc=%d vlen=%d etype=%s ismask=0 is_masked_op=1",
                     n, sopc, num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -486,10 +425,8 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     case 3: {
       opd3 = unbox_vector(argument(7), vbox_type, elem_bt, num_elem);
       if (opd3 == nullptr) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** unbox failed v3=%s",
+        log_if_needed("  ** unbox failed v3=%s",
                         NodeClassNames[argument(7)->Opcode()]);
-        }
         return false;
       }
       // fall-through
@@ -497,10 +434,8 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     case 2: {
       opd2 = unbox_vector(argument(6), vbox_type, elem_bt, num_elem);
       if (opd2 == nullptr) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** unbox failed v2=%s",
+        log_if_needed("  ** unbox failed v2=%s",
                         NodeClassNames[argument(6)->Opcode()]);
-        }
         return false;
       }
       // fall-through
@@ -508,10 +443,8 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     case 1: {
       opd1 = unbox_vector(argument(5), vbox_type, elem_bt, num_elem);
       if (opd1 == nullptr) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** unbox failed v1=%s",
+        log_if_needed("  ** unbox failed v1=%s",
                         NodeClassNames[argument(5)->Opcode()]);
-        }
         return false;
       }
       break;
@@ -526,10 +459,8 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(argument(n + 5), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s",
+      log_if_needed("  ** unbox failed mask=%s",
                       NodeClassNames[argument(n + 5)->Opcode()]);
-      }
       return false;
     }
   }
@@ -539,12 +470,10 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     assert(UseVectorStubs, "sanity");
     operation = gen_call_to_svml(opr->get_con(), elem_bt, num_elem, opd1, opd2);
     if (operation == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** svml call failed for %s_%s_%d",
+      log_if_needed("  ** svml call failed for %s_%s_%d",
                          (elem_bt == T_FLOAT)?"float":"double",
                          VectorSupport::svmlname[opr->get_con() - VectorSupport::VECTOR_OP_SVML_START],
                          num_elem * type2aelembytes(elem_bt));
-      }
       return false;
      }
   } else {
@@ -599,9 +528,7 @@ bool LibraryCallKit::inline_vector_shuffle_iota() {
   }
 
   if (!is_klass_initialized(shuffle_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -708,9 +635,7 @@ bool LibraryCallKit::inline_vector_mask_operation() {
   }
 
   if (!is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -720,10 +645,8 @@ bool LibraryCallKit::inline_vector_mask_operation() {
 
   int mopc = VectorSupport::vop2ideal(oper->get_con(), elem_bt);
   if (!arch_supports_vector(mopc, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
+    log_if_needed("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
                     mopc, num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -732,10 +655,8 @@ bool LibraryCallKit::inline_vector_mask_operation() {
   const TypeInstPtr* mask_box_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
   Node* mask_vec = unbox_vector(mask, mask_box_type, elem_bt, num_elem, true);
   if (mask_vec == nullptr) {
-    if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s",
+    log_if_needed("  ** unbox failed mask=%s",
                       NodeClassNames[argument(4)->Opcode()]);
-    }
     return false;
   }
 
@@ -774,9 +695,7 @@ bool LibraryCallKit::inline_vector_shuffle_to_vector() {
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(shuffle_klass) || !is_klass_initialized(vector_klass) ) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -791,10 +710,8 @@ bool LibraryCallKit::inline_vector_shuffle_to_vector() {
   int cast_vopc = VectorCastNode::opcode(-1, T_BYTE); // from shuffle of type T_BYTE
   // Make sure that cast is implemented to particular type/size combination.
   if (!arch_supports_vector(cast_vopc, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
+    log_if_needed("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
         cast_vopc, num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -838,27 +755,21 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
   if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr || mode == nullptr ||
       bits_type == nullptr || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr ||
       !vlen->is_con() || !mode->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s bitwise=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s bitwise=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(5)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -872,12 +783,10 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
   int opc = bcast_mode == VectorSupport::MODE_BITS_COERCED_LONG_TO_MASK ? Op_VectorLongToMask : Op_Replicate;
 
   if (!arch_supports_vector(opc, num_elem, elem_bt, checkFlags, true /*has_scalar_args*/)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=0 op=broadcast vlen=%d etype=%s ismask=%d bcast_mode=%d",
+    log_if_needed("  ** not supported: arity=0 op=broadcast vlen=%d etype=%s ismask=%d bcast_mode=%d",
                     num_elem, type2name(elem_bt),
                     is_mask ? 1 : 0,
                     bcast_mode);
-    }
     return false; // not supported
   }
 
@@ -973,27 +882,21 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
 
   if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr || !from_ms->is_con() ||
       vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s from_ms=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s from_ms=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(6)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -1001,11 +904,9 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
 
   // TODO When mask usage is supported, VecMaskNotUsed needs to be VecMaskUseLoad.
   if (!arch_supports_vector(is_store ? Op_StoreVector : Op_LoadVector, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s ismask=no",
                     is_store, is_store ? "store" : "load",
                     num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -1046,18 +947,14 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
                       arr_type->elem()->array_element_basic_type() != elem_bt);
   BasicType mem_elem_bt = mismatched_ms ? arr_type->elem()->array_element_basic_type() : elem_bt;
   if (!is_java_primitive(mem_elem_bt)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** non-primitive array element type");
-    }
+    log_if_needed("  ** non-primitive array element type");
     return false;
   }
   int mem_num_elem = mismatched_ms ? (num_elem * type2aelembytes(elem_bt)) / type2aelembytes(mem_elem_bt) : num_elem;
   if (arr_type != nullptr && !is_mask && !elem_consistent_with_arr(elem_bt, arr_type, mismatched_ms)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s ismask=no",
                     is_store, is_store ? "store" : "load",
                     num_elem, type2name(elem_bt), type2name(arr_type->elem()->array_element_basic_type()));
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1068,11 +965,9 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
     if (is_store) {
       if (!arch_supports_vector(Op_StoreVector, num_elem, elem_bt, VecMaskNotUsed)
           || !arch_supports_vector(Op_VectorReinterpret, mem_num_elem, mem_elem_bt, VecMaskNotUsed)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d*8 etype=%s/8 ismask=no",
+        log_if_needed("  ** not supported: arity=%d op=%s vlen=%d*8 etype=%s/8 ismask=no",
                         is_store, "store",
                         num_elem, type2name(elem_bt));
-        }
         set_map(old_map);
         set_sp(old_sp);
         return false; // not supported
@@ -1080,11 +975,9 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
     } else {
       if (!arch_supports_vector(Op_LoadVector, mem_num_elem, mem_elem_bt, VecMaskNotUsed)
           || !arch_supports_vector(Op_VectorReinterpret, num_elem, elem_bt, VecMaskNotUsed)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d*8 etype=%s/8 ismask=no",
+        log_if_needed("  ** not supported: arity=%d op=%s vlen=%d*8 etype=%s/8 ismask=no",
                         is_store, "load",
                         mem_num_elem, type2name(mem_elem_bt));
-        }
         set_map(old_map);
         set_sp(old_sp);
         return false; // not supported
@@ -1198,35 +1091,27 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   if (vector_klass == nullptr || mask_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       vector_klass->const_oop() == nullptr || mask_klass->const_oop() == nullptr || from_ms == nullptr ||
       elem_klass->const_oop() == nullptr || !vlen->is_con() || !from_ms->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s from_ms=%s",
+    log_if_needed("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s from_ms=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(7)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   if (!is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** mask klass argument not initialized");
-    }
+    log_if_needed("  ** mask klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -1248,11 +1133,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   BIG_ENDIAN_ONLY(if (mismatched_ms) return false;)
   // If there is no consistency between array and vector element types, it must be special byte array case
   if (arr_type != nullptr && !elem_consistent_with_arr(elem_bt, arr_type, mismatched_ms)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s",
                     is_store, is_store ? "storeMasked" : "loadMasked",
                     num_elem, type2name(elem_bt), type2name(arr_type->elem()->array_element_basic_type()));
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1274,10 +1157,8 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
       // Masked vector load with IOOBE always uses the predicated load.
       const TypeInt* offset_in_range = gvn().type(argument(9))->isa_int();
       if (!offset_in_range->is_con()) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** missing constant: offsetInRange=%s",
+        log_if_needed("  ** missing constant: offsetInRange=%s",
                         NodeClassNames[argument(8)->Opcode()]);
-        }
         set_map(old_map);
         set_sp(old_sp);
         return false;
@@ -1286,11 +1167,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
     }
 
     if (needs_predicate) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: op=%s vlen=%d etype=%s mismatched_ms=%d",
+      log_if_needed("  ** not supported: op=%s vlen=%d etype=%s mismatched_ms=%d",
                       is_store ? "storeMasked" : "loadMasked",
                       num_elem, type2name(elem_bt), mismatched_ms ? 1 : 0);
-      }
       set_map(old_map);
       set_sp(old_sp);
       return false;
@@ -1301,10 +1180,8 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   // the normal vector load and blend operations are supported by backend.
   if (!supports_predicate && (!arch_supports_vector(Op_LoadVector, mem_num_elem, mem_elem_bt, VecMaskNotUsed) ||
       !arch_supports_vector(Op_VectorBlend, mem_num_elem, mem_elem_bt, VecMaskUseLoad))) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: op=loadMasked vlen=%d etype=%s mismatched_ms=%d",
+    log_if_needed("  ** not supported: op=loadMasked vlen=%d etype=%s mismatched_ms=%d",
                     num_elem, type2name(elem_bt), mismatched_ms ? 1 : 0);
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1314,11 +1191,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   // with byte type is supported by backend.
   if (mismatched_ms) {
     if (!arch_supports_vector(Op_VectorReinterpret, mem_num_elem, T_BYTE, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s mismatched_ms=1",
+      log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s mismatched_ms=1",
                       is_store, is_store ? "storeMasked" : "loadMasked",
                       num_elem, type2name(elem_bt));
-      }
       set_map(old_map);
       set_sp(old_sp);
       return false;
@@ -1328,11 +1203,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   // Since it needs to unbox the mask, we need to double check that the related load operations
   // for mask are supported by backend.
   if (!arch_supports_vector(Op_LoadVector, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s",
                       is_store, is_store ? "storeMasked" : "loadMasked",
                       num_elem, type2name(elem_bt));
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1352,11 +1225,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
 
   Node* mask = unbox_vector(is_store ? argument(9) : argument(8), mbox_type, elem_bt, num_elem);
   if (mask == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** unbox failed mask=%s",
+    log_if_needed("  ** unbox failed mask=%s",
                     is_store ? NodeClassNames[argument(9)->Opcode()]
                              : NodeClassNames[argument(8)->Opcode()]);
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1365,10 +1236,8 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   if (is_store) {
     Node* val = unbox_vector(argument(8), vbox_type, elem_bt, num_elem);
     if (val == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed vector=%s",
+      log_if_needed("  ** unbox failed vector=%s",
                       NodeClassNames[argument(8)->Opcode()]);
-      }
       set_map(old_map);
       set_sp(old_sp);
       return false; // operand unboxing failed
@@ -1460,28 +1329,22 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
 
   if (vector_klass == nullptr || elem_klass == nullptr || vector_idx_klass == nullptr || vlen == nullptr ||
       vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || vector_idx_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s viclass=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s viclass=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(vector_idx_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -1492,44 +1355,34 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
     if (mask_klass == nullptr || mask_klass->const_oop() == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: maskclass=%s", NodeClassNames[argument(1)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: maskclass=%s", NodeClassNames[argument(1)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     if (!is_klass_initialized(mask_klass)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** mask klass argument not initialized");
-      }
+      log_if_needed("  ** mask klass argument not initialized");
       return false;
     }
 
     if (vmask_type->maybe_null()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** null mask values are not allowed for masked op");
-      }
+      log_if_needed("  ** null mask values are not allowed for masked op");
       return false;
     }
 
     // Check whether the predicated gather/scatter node is supported by architecture.
     VectorMaskUseType mask = (VectorMaskUseType) (VecMaskUseLoad | VecMaskUsePred);
     if (!arch_supports_vector(is_scatter ? Op_StoreVectorScatterMasked : Op_LoadVectorGatherMasked, num_elem, elem_bt, mask)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=1",
+      log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=1",
                       is_scatter, is_scatter ? "scatterMasked" : "gatherMasked",
                       num_elem, type2name(elem_bt));
-      }
       return false; // not supported
     }
   } else {
     // Check whether the normal gather/scatter node is supported for non-masked operation.
     if (!arch_supports_vector(is_scatter ? Op_StoreVectorScatter : Op_LoadVectorGather, num_elem, elem_bt, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=0",
+      log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=0",
                       is_scatter, is_scatter ? "scatter" : "gather",
                       num_elem, type2name(elem_bt));
-      }
       return false; // not supported
     }
   }
@@ -1537,11 +1390,9 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
   // Check that the vector holding indices is supported by architecture
   // For sub-word gathers expander receive index array.
   if (!is_subword_type(elem_bt) && !arch_supports_vector(Op_LoadVector, num_elem, T_INT, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=%d op=%s/loadindex vlen=%d etype=int is_masked_op=%d",
+      log_if_needed("  ** not supported: arity=%d op=%s/loadindex vlen=%d etype=int is_masked_op=%d",
                       is_scatter, is_scatter ? "scatter" : "gather",
                       num_elem, is_masked_op ? 1 : 0);
-      }
       return false; // not supported
   }
 
@@ -1559,11 +1410,9 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
 
   // The array must be consistent with vector type
   if (arr_type == nullptr || (arr_type != nullptr && !elem_consistent_with_arr(elem_bt, arr_type, false))) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s ismask=no",
                     is_scatter, is_scatter ? "scatter" : "gather",
                     num_elem, type2name(elem_bt), type2name(arr_type->elem()->array_element_basic_type()));
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1595,11 +1444,9 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(is_scatter ? argument(10) : argument(9), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s",
+      log_if_needed("  ** unbox failed mask=%s",
                     is_scatter ? NodeClassNames[argument(10)->Opcode()]
                                : NodeClassNames[argument(9)->Opcode()]);
-      }
       set_map(old_map);
       set_sp(old_sp);
       return false;
@@ -1669,26 +1516,20 @@ bool LibraryCallKit::inline_vector_reduction() {
 
   if (opr == nullptr || vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       !opr->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -1696,23 +1537,17 @@ bool LibraryCallKit::inline_vector_reduction() {
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
     if (mask_klass == nullptr || mask_klass->const_oop() == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     if (!is_klass_initialized(mask_klass)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** mask klass argument not initialized");
-      }
+      log_if_needed("  ** mask klass argument not initialized");
       return false;
     }
 
     if (vmask_type->maybe_null()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** null mask values are not allowed for masked op");
-      }
+      log_if_needed("  ** null mask values are not allowed for masked op");
       return false;
     }
   }
@@ -1724,20 +1559,16 @@ bool LibraryCallKit::inline_vector_reduction() {
 
   // When using mask, mask use type needs to be VecMaskUseLoad.
   if (!arch_supports_vector(sopc, num_elem, elem_bt, is_masked_op ? VecMaskUseLoad : VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=%d/reduce vlen=%d etype=%s is_masked_op=%d",
+    log_if_needed("  ** not supported: arity=1 op=%d/reduce vlen=%d etype=%s is_masked_op=%d",
                     sopc, num_elem, type2name(elem_bt), is_masked_op ? 1 : 0);
-    }
     return false;
   }
 
   // Return true if current platform has implemented the masked operation with predicate feature.
   bool use_predicate = is_masked_op && arch_supports_vector(sopc, num_elem, elem_bt, VecMaskUsePred);
   if (is_masked_op && !use_predicate && !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=%d/reduce vlen=%d etype=%s is_masked_op=1",
+    log_if_needed("  ** not supported: arity=1 op=%d/reduce vlen=%d etype=%s is_masked_op=1",
                     sopc, num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -1756,10 +1587,8 @@ bool LibraryCallKit::inline_vector_reduction() {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(argument(6), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s",
+      log_if_needed("  ** unbox failed mask=%s",
                       NodeClassNames[argument(6)->Opcode()]);
-      }
       return false;
     }
   }
@@ -1822,26 +1651,20 @@ bool LibraryCallKit::inline_vector_test() {
 
   if (cond == nullptr || vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       !cond->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: cond=%s vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: cond=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -1851,11 +1674,9 @@ bool LibraryCallKit::inline_vector_test() {
   const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
 
   if (!arch_supports_vector(Op_VectorTest, num_elem, elem_bt, is_vector_mask(vbox_klass) ? VecMaskUseLoad : VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=2 op=test/%d vlen=%d etype=%s ismask=%d",
+    log_if_needed("  ** not supported: arity=2 op=test/%d vlen=%d etype=%s ismask=%d",
                     cond->get_con(), num_elem, type2name(elem_bt),
                     is_vector_mask(vbox_klass));
-    }
     return false;
   }
 
@@ -1900,26 +1721,20 @@ bool LibraryCallKit::inline_vector_blend() {
   }
   if (mask_klass->const_oop() == nullptr || vector_klass->const_oop() == nullptr ||
       elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -1927,10 +1742,8 @@ bool LibraryCallKit::inline_vector_blend() {
   int num_elem = vlen->get_con();
 
   if (!arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=2 op=blend vlen=%d etype=%s ismask=useload",
+    log_if_needed("  ** not supported: arity=2 op=blend vlen=%d etype=%s ismask=useload",
                     num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
   ciKlass* vbox_klass = vector_klass->const_oop()->as_instance()->java_lang_Class_klass();
@@ -1974,27 +1787,21 @@ bool LibraryCallKit::inline_vector_compare() {
   }
   if (!cond->is_con() || vector_klass->const_oop() == nullptr || mask_klass->const_oop() == nullptr ||
       elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: cond=%s vclass=%s mclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: cond=%s vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -2004,19 +1811,15 @@ bool LibraryCallKit::inline_vector_compare() {
 
   if ((cond->get_con() & BoolTest::unsigned_compare) != 0) {
     if (!Matcher::supports_vector_comparison_unsigned(num_elem, elem_bt)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: unsigned comparison op=comp/%d vlen=%d etype=%s ismask=usestore",
+      log_if_needed("  ** not supported: unsigned comparison op=comp/%d vlen=%d etype=%s ismask=usestore",
                       cond->get_con() & (BoolTest::unsigned_compare - 1), num_elem, type2name(elem_bt));
-      }
       return false;
     }
   }
 
   if (!arch_supports_vector(Op_VectorMaskCmp, num_elem, elem_bt, VecMaskUseStore)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore",
+    log_if_needed("  ** not supported: arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore",
                     cond->get_con(), num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -2032,19 +1835,15 @@ bool LibraryCallKit::inline_vector_compare() {
   bool is_masked_op = argument(7)->bottom_type() != TypePtr::NULL_PTR;
   Node* mask = is_masked_op ? unbox_vector(argument(7), mbox_type, elem_bt, num_elem) : nullptr;
   if (is_masked_op && mask == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: mask = null arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore is_masked_op=1",
+    log_if_needed("  ** not supported: mask = null arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore is_masked_op=1",
                     cond->get_con(), num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
   bool use_predicate = is_masked_op && arch_supports_vector(Op_VectorMaskCmp, num_elem, elem_bt, VecMaskUsePred);
   if (is_masked_op && !use_predicate && !arch_supports_vector(Op_AndV, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore is_masked_op=1",
+    log_if_needed("  ** not supported: arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore is_masked_op=1",
                     cond->get_con(), num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -2097,27 +1896,21 @@ bool LibraryCallKit::inline_vector_rearrange() {
       vector_klass->const_oop()  == nullptr ||
       elem_klass->const_oop()    == nullptr ||
       !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s sclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s sclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)  ||
       !is_klass_initialized(shuffle_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -2125,10 +1918,8 @@ bool LibraryCallKit::inline_vector_rearrange() {
   int num_elem = vlen->get_con();
 
   if (!arch_supports_vector(Op_VectorLoadShuffle, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=0 op=load/shuffle vlen=%d etype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=0 op=load/shuffle vlen=%d etype=%s ismask=no",
                     num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -2138,9 +1929,7 @@ bool LibraryCallKit::inline_vector_rearrange() {
       (mask_klass == nullptr ||
        mask_klass->const_oop() == nullptr ||
        !is_klass_initialized(mask_klass))) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** mask_klass argument not initialized");
-    }
+    log_if_needed("  ** mask_klass argument not initialized");
   }
   VectorMaskUseType checkFlags = (VectorMaskUseType)(is_masked_op ? (VecMaskUseLoad | VecMaskUsePred) : VecMaskNotUsed);
   if (!arch_supports_vector(Op_VectorRearrange, num_elem, elem_bt, checkFlags)) {
@@ -2149,10 +1938,8 @@ bool LibraryCallKit::inline_vector_rearrange() {
        (!arch_supports_vector(Op_VectorRearrange, num_elem, elem_bt, VecMaskNotUsed) ||
         !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad)     ||
         !arch_supports_vector(Op_Replicate, num_elem, elem_bt, VecMaskNotUsed))) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=2 op=shuffle/rearrange vlen=%d etype=%s ismask=no",
+      log_if_needed("  ** not supported: arity=2 op=shuffle/rearrange vlen=%d etype=%s ismask=no",
                       num_elem, type2name(elem_bt));
-      }
       return false; // not supported
     }
   }
@@ -2175,10 +1962,8 @@ bool LibraryCallKit::inline_vector_rearrange() {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(argument(7), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=3 op=shuffle/rearrange vlen=%d etype=%s ismask=useload is_masked_op=1",
+      log_if_needed("  ** not supported: arity=3 op=shuffle/rearrange vlen=%d etype=%s ismask=useload is_masked_op=1",
                       num_elem, type2name(elem_bt));
-      }
       return false;
     }
   }
@@ -2280,19 +2065,15 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
     return false; // dead code
   }
   if (!opr->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -2300,32 +2081,24 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
     if (mask_klass == nullptr || mask_klass->const_oop() == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     if (!is_klass_initialized(mask_klass)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** mask klass argument not initialized");
-      }
+      log_if_needed("  ** mask klass argument not initialized");
       return false;
     }
 
     if (vmask_type->maybe_null()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** null mask values are not allowed for masked op");
-      }
+      log_if_needed("  ** null mask values are not allowed for masked op");
       return false;
     }
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -2337,17 +2110,13 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
   bool is_rotate = VectorNode::is_rotate_opcode(opc);
 
   if (opc == 0 || (!is_shift && !is_rotate)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** operation not supported: op=%d bt=%s", opr->get_con(), type2name(elem_bt));
-    }
+    log_if_needed("  ** operation not supported: op=%d bt=%s", opr->get_con(), type2name(elem_bt));
     return false; // operation not supported
   }
 
   int sopc = VectorNode::opcode(opc, elem_bt);
   if (sopc == 0) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
-    }
+    log_if_needed("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
     return false; // operation not supported
   }
 
@@ -2370,10 +2139,8 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
         (!arch_supports_vector(sopc, num_elem, elem_bt, VecMaskNotUsed, has_scalar_args) ||
          !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad))) {
 
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=0 op=int/%d vlen=%d etype=%s is_masked_op=%d",
+      log_if_needed("  ** not supported: arity=0 op=int/%d vlen=%d etype=%s is_masked_op=%d",
                       sopc, num_elem, type2name(elem_bt), is_masked_op ? 1 : 0);
-      }
       return false; // not supported
     }
   }
@@ -2404,9 +2171,7 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(argument(7), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s", NodeClassNames[argument(7)->Opcode()]);
-      }
+      log_if_needed("  ** unbox failed mask=%s", NodeClassNames[argument(7)->Opcode()]);
       return false;
     }
   }
@@ -2456,8 +2221,7 @@ bool LibraryCallKit::inline_vector_convert() {
   if (!opr->is_con() ||
       vector_klass_from->const_oop() == nullptr || elem_klass_from->const_oop() == nullptr || !vlen_from->is_con() ||
       vector_klass_to->const_oop() == nullptr || elem_klass_to->const_oop() == nullptr || !vlen_to->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass_from=%s etype_from=%s vlen_from=%s vclass_to=%s etype_to=%s vlen_to=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass_from=%s etype_from=%s vlen_from=%s vclass_to=%s etype_to=%s vlen_to=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
@@ -2465,13 +2229,10 @@ bool LibraryCallKit::inline_vector_convert() {
                     NodeClassNames[argument(4)->Opcode()],
                     NodeClassNames[argument(5)->Opcode()],
                     NodeClassNames[argument(6)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass_from) || !is_klass_initialized(vector_klass_to)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -2508,11 +2269,9 @@ bool LibraryCallKit::inline_vector_convert() {
                             num_elem_from,
                             elem_bt_from,
                             is_mask ? VecMaskUseAll : VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=%s/1 vlen1=%d etype1=%s ismask=%d",
+    log_if_needed("  ** not supported: arity=1 op=%s/1 vlen1=%d etype1=%s ismask=%d",
                     is_cast ? "cast" : "reinterpret",
                     num_elem_from, type2name(elem_bt_from), is_mask);
-    }
     return false;
   }
 
@@ -2521,11 +2280,9 @@ bool LibraryCallKit::inline_vector_convert() {
                             num_elem_to,
                             elem_bt_to,
                             is_mask ? VecMaskUseAll : VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=%s/2 vlen2=%d etype2=%s ismask=%d",
+    log_if_needed("  ** not supported: arity=1 op=%s/2 vlen2=%d etype2=%s ismask=%d",
                     is_cast ? "cast" : "reinterpret",
                     num_elem_to, type2name(elem_bt_to), is_mask);
-    }
     return false;
   }
 
@@ -2565,10 +2322,8 @@ bool LibraryCallKit::inline_vector_convert() {
     // Make sure that vector cast is implemented to particular type/size combination if it is
     // not a mask casting.
     if (!is_mask && !arch_supports_vector(cast_vopc, num_elem_to, elem_bt_to, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s ismask=%d",
+      log_if_needed("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s ismask=%d",
                       cast_vopc, num_elem_to, type2name(elem_bt_to), is_mask);
-      }
       return false;
     }
 
@@ -2580,11 +2335,9 @@ bool LibraryCallKit::inline_vector_convert() {
       // It is possible that arch does not support this intermediate vector size
       // TODO More complex logic required here to handle this corner case for the sizes.
       if (!arch_supports_vector(cast_vopc, num_elem_for_cast, elem_bt_to, VecMaskNotUsed)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** not supported: arity=1 op=cast#%d/4 vlen1=%d etype2=%s ismask=%d",
+        log_if_needed("  ** not supported: arity=1 op=cast#%d/4 vlen1=%d etype2=%s ismask=%d",
                         cast_vopc,
                         num_elem_for_cast, type2name(elem_bt_to), is_mask);
-        }
         return false;
       }
 
@@ -2602,10 +2355,8 @@ bool LibraryCallKit::inline_vector_convert() {
                                 num_elem_for_resize,
                                 elem_bt_from,
                                 VecMaskNotUsed)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** not supported: arity=1 op=cast/5 vlen2=%d etype1=%s ismask=%d",
+        log_if_needed("  ** not supported: arity=1 op=cast/5 vlen2=%d etype1=%s ismask=%d",
                         num_elem_for_resize, type2name(elem_bt_from), is_mask);
-        }
         return false;
       }
 
@@ -2616,10 +2367,8 @@ bool LibraryCallKit::inline_vector_convert() {
       if (is_mask) {
         // Make sure that cast for vector mask is implemented to particular type/size combination.
         if (!arch_supports_vector(Op_VectorMaskCast, num_elem_to, elem_bt_to, VecMaskNotUsed)) {
-          if (C->print_intrinsics()) {
-            tty->print_cr("  ** not supported: arity=1 op=maskcast vlen2=%d etype2=%s ismask=%d",
+          log_if_needed("  ** not supported: arity=1 op=maskcast vlen2=%d etype2=%s ismask=%d",
                           num_elem_to, type2name(elem_bt_to), is_mask);
-          }
           return false;
         }
         op = gvn().transform(new VectorMaskCastNode(op, dst_type));
@@ -2657,35 +2406,27 @@ bool LibraryCallKit::inline_vector_insert() {
     return false; // dead code
   }
   if (vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con() || !idx->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s idx=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s idx=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
   int num_elem = vlen->get_con();
   if (!arch_supports_vector(Op_VectorInsert, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=insert vlen=%d etype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=1 op=insert vlen=%d etype=%s ismask=no",
                     num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -2751,25 +2492,19 @@ bool LibraryCallKit::inline_vector_extract() {
     return false; // dead code
   }
   if (vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -2807,26 +2542,20 @@ bool LibraryCallKit::inline_vector_extract() {
       opd = gvn().transform(new URShiftLNode(opd, pos));
       opd = gvn().transform(new AndLNode(opd, gvn().makecon(TypeLong::ONE)));
     } else {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected mask extraction because architecture does not support it");
-      }
+      log_if_needed("  ** Rejected mask extraction because architecture does not support it");
       return false; // not supported
     }
   } else {
     // vbox_klass is vector. This is used for Vector.lane(int).
     if (!idx->is_con()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: idx=%s", NodeClassNames[argument(4)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: idx=%s", NodeClassNames[argument(4)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     int vopc = ExtractNode::opcode(elem_bt);
     if (!arch_supports_vector(vopc, num_elem, elem_bt, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=1 op=extract vlen=%d etype=%s ismask=no",
+      log_if_needed("  ** not supported: arity=1 op=extract vlen=%d etype=%s ismask=no",
                       num_elem, type2name(elem_bt));
-      }
       return false; // not supported
     }
 
@@ -2882,29 +2611,23 @@ bool LibraryCallKit::inline_vector_compress_expand() {
   if (vector_klass == nullptr || elem_klass == nullptr || mask_klass == nullptr || vlen == nullptr ||
       vector_klass->const_oop() == nullptr || mask_klass->const_oop() == nullptr ||
       elem_klass->const_oop() == nullptr || !vlen->is_con() || !opr->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass=%s mclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -2913,10 +2636,8 @@ bool LibraryCallKit::inline_vector_compress_expand() {
   int opc = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
 
   if (!arch_supports_vector(opc, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: opc=%d vlen=%d etype=%s ismask=useload",
+    log_if_needed("  ** not supported: opc=%d vlen=%d etype=%s ismask=useload",
                     opc, num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -2927,10 +2648,8 @@ bool LibraryCallKit::inline_vector_compress_expand() {
     vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
     opd1 = unbox_vector(argument(5), vbox_type, elem_bt, num_elem);
     if (opd1 == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed vector=%s",
+      log_if_needed("  ** unbox failed vector=%s",
                       NodeClassNames[argument(5)->Opcode()]);
-      }
       return false;
     }
   }
@@ -2941,10 +2660,8 @@ bool LibraryCallKit::inline_vector_compress_expand() {
 
   Node* mask = unbox_vector(argument(6), mbox_type, elem_bt, num_elem);
   if (mask == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** unbox failed mask=%s",
+    log_if_needed("  ** unbox failed mask=%s",
                     NodeClassNames[argument(6)->Opcode()]);
-    }
     return false;
   }
 
@@ -2975,27 +2692,21 @@ bool LibraryCallKit::inline_index_vector() {
   if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       vector_klass->const_oop() == nullptr || !vlen->is_con() ||
       elem_klass->const_oop() == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -3004,9 +2715,7 @@ bool LibraryCallKit::inline_index_vector() {
 
   // Check whether the iota index generation op is supported by the current hardware
   if (!arch_supports_vector(Op_VectorLoadConst, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
-    }
+    log_if_needed("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
     return false; // not supported
   }
 
@@ -3021,9 +2730,7 @@ bool LibraryCallKit::inline_index_vector() {
   } else {
     // Check whether the vector multiply op is supported by the current hardware
     if (!arch_supports_vector(vmul_op, num_elem, elem_bt, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
-      }
+      log_if_needed("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
       return false; // not supported
     }
 
@@ -3032,10 +2739,8 @@ bool LibraryCallKit::inline_index_vector() {
       int cast_op = elem_bt == T_LONG ? Op_ConvI2L :
                     elem_bt == T_FLOAT? Op_ConvI2F : Op_ConvI2D;
       if (!Matcher::match_rule_supported(cast_op)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** Rejected op (%s) because architecture does not support it",
+        log_if_needed("  ** Rejected op (%s) because architecture does not support it",
                         NodeClassNames[cast_op]);
-        }
         return false; // not supported
       }
     }
@@ -3045,10 +2750,8 @@ bool LibraryCallKit::inline_index_vector() {
   const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
   Node* opd = unbox_vector(argument(3), vbox_type, elem_bt, num_elem);
   if (opd == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** unbox failed vector=%s",
+    log_if_needed("  ** unbox failed vector=%s",
                     NodeClassNames[argument(3)->Opcode()]);
-    }
     return false;
   }
 
@@ -3061,9 +2764,7 @@ bool LibraryCallKit::inline_index_vector() {
   } else {
     // Check whether the vector addition op is supported by the current hardware
     if (!arch_supports_vector(vadd_op, num_elem, elem_bt, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
-      }
+      log_if_needed("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
       return false; // not supported
     }
   }
@@ -3124,27 +2825,21 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
 
   if (mask_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       mask_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: mclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -3157,9 +2852,7 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
     if (!arch_supports_vector(Op_VectorLoadConst, num_elem, elem_bt, VecMaskNotUsed) ||
         !arch_supports_vector(Op_Replicate, num_elem, elem_bt, VecMaskNotUsed) ||
         !arch_supports_vector(Op_VectorMaskCmp, num_elem, elem_bt, VecMaskUseStore)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
-      }
+      log_if_needed("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
       return false; // not supported
     }
 
@@ -3168,10 +2861,8 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
       int cast_op = is_integral_type(elem_bt) ? Op_ConvL2I
                                               : (elem_bt == T_FLOAT ? Op_ConvL2F : Op_ConvL2D);
       if (!Matcher::match_rule_supported(cast_op)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** Rejected op (%s) because architecture does not support it",
+        log_if_needed("  ** Rejected op (%s) because architecture does not support it",
                         NodeClassNames[cast_op]);
-        }
         return false; // not supported
       }
     }
@@ -3180,9 +2871,7 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
   Node* offset = argument(3);
   Node* limit = argument(5);
   if (offset == nullptr || limit == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** offset or limit argument is null");
-    }
+    log_if_needed("  ** offset or limit argument is null");
     return false; // not supported
   }
 
@@ -3238,3 +2927,6 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
   C->set_max_vector_size(MAX2(C->max_vector_size(), (uint)(num_elem * type2aelembytes(elem_bt))));
   return true;
 }
+
+#undef non_product_log_if_needed
+#undef log_if_needed
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 5a87e16c855b2..c2b6d27986b94 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -929,7 +929,9 @@ class JvmtiClassFileLoadHookPoster : public StackObj {
     _cached_class_file_ptr = cache_ptr;
     _has_been_modified = false;
 
-    assert(!_thread->is_in_any_VTMS_transition(), "CFLH events are not allowed in any VTMS transition");
+    if (_thread->is_in_any_VTMS_transition()) {
+      return; // no events should be posted if thread is in any VTMS transition
+    }
     _state = JvmtiExport::get_jvmti_thread_state(_thread);
     if (_state != nullptr) {
       _class_being_redefined = _state->get_class_being_redefined();
@@ -1366,10 +1368,9 @@ void JvmtiExport::post_class_load(JavaThread *thread, Klass* klass) {
   if (state == nullptr) {
     return;
   }
-  if (thread->is_in_tmp_VTMS_transition()) {
-    return; // skip ClassLoad events in tmp VTMS transition
+  if (thread->is_in_any_VTMS_transition()) {
+    return; // no events should be posted if thread is in any VTMS transition
   }
-  assert(!thread->is_in_any_VTMS_transition(), "class load events are not allowed in any VTMS transition");
 
   EVT_TRIG_TRACE(JVMTI_EVENT_CLASS_LOAD, ("[%s] Trg Class Load triggered",
                       JvmtiTrace::safe_get_thread_name(thread)));
@@ -1404,10 +1405,9 @@ void JvmtiExport::post_class_prepare(JavaThread *thread, Klass* klass) {
   if (state == nullptr) {
     return;
   }
-  if (thread->is_in_tmp_VTMS_transition()) {
-    return; // skip ClassPrepare events in tmp VTMS transition
+  if (thread->is_in_any_VTMS_transition()) {
+    return; // no events should be posted if thread is in any VTMS transition
   }
-  assert(!thread->is_in_any_VTMS_transition(), "class prepare events are not allowed in any VTMS transition");
 
   EVT_TRIG_TRACE(JVMTI_EVENT_CLASS_PREPARE, ("[%s] Trg Class Prepare triggered",
                       JvmtiTrace::safe_get_thread_name(thread)));
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 7a4a59a855315..53a0f2e9c3b51 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -35,6 +35,7 @@
 #include "compiler/compilationPolicy.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/memAllocator.hpp"
 #include "interpreter/bytecode.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "interpreter/interpreter.hpp"
@@ -535,7 +536,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
 #if COMPILER2_OR_JVMCI
   if ((jvmci_enabled COMPILER2_PRESENT( || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateLocks) ))
       && !EscapeBarrier::objs_are_deoptimized(current, deoptee.id())) {
-    bool unused;
+    bool unused = false;
     restore_eliminated_locks(current, chunk, realloc_failures, deoptee, exec_mode, unused);
   }
 #endif // COMPILER2_OR_JVMCI
@@ -1237,6 +1238,7 @@ bool Deoptimization::realloc_objects(JavaThread* thread, frame* fr, RegisterMap*
 
       InstanceKlass* ik = InstanceKlass::cast(k);
       if (obj == nullptr && !cache_init_error) {
+        InternalOOMEMark iom(THREAD);
 #if COMPILER2_OR_JVMCI
         if (EnableVectorSupport && VectorSupport::is_vector(ik)) {
           obj = VectorSupport::allocate_vector(ik, fr, reg_map, sv, THREAD);
@@ -1251,9 +1253,11 @@ bool Deoptimization::realloc_objects(JavaThread* thread, frame* fr, RegisterMap*
       TypeArrayKlass* ak = TypeArrayKlass::cast(k);
       assert(sv->field_size() % type2size[ak->element_type()] == 0, "non-integral array length");
       int len = sv->field_size() / type2size[ak->element_type()];
+      InternalOOMEMark iom(THREAD);
       obj = ak->allocate(len, THREAD);
     } else if (k->is_objArray_klass()) {
       ObjArrayKlass* ak = ObjArrayKlass::cast(k);
+      InternalOOMEMark iom(THREAD);
       obj = ak->allocate(sv->field_size(), THREAD);
     }
 
@@ -1732,7 +1736,7 @@ void Deoptimization::pop_frames_failed_reallocs(JavaThread* thread, vframeArray*
           ObjectSynchronizer::exit(src->obj(), src->lock(), thread);
         }
       }
-      array->element(i)->free_monitors(thread);
+      array->element(i)->free_monitors();
 #ifdef ASSERT
       array->element(i)->set_removed_monitors();
 #endif
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 2e40c99455c9d..97be533341364 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -430,8 +430,6 @@ JavaThread::JavaThread() :
   _active_handles(nullptr),
   _free_handle_block(nullptr),
 
-  _monitor_chunks(nullptr),
-
   _suspend_flags(0),
 
   _thread_state(_thread_new),
@@ -456,11 +454,11 @@ JavaThread::JavaThread() :
 #endif
 #endif
   _jni_attach_state(_not_attaching_via_jni),
+  _is_in_internal_oome_mark(false),
 #if INCLUDE_JVMCI
   _pending_deoptimization(-1),
   _pending_monitorenter(false),
   _pending_transfer_to_interpreter(false),
-  _in_retryable_allocation(false),
   _pending_failed_speculation(0),
   _jvmci{nullptr},
   _libjvmci_runtime(nullptr),
@@ -1050,13 +1048,7 @@ JavaThread* JavaThread::active() {
 
 bool JavaThread::is_lock_owned(address adr) const {
   assert(LockingMode != LM_LIGHTWEIGHT, "should not be called with new lightweight locking");
-  if (Thread::is_lock_owned(adr)) return true;
-
-  for (MonitorChunk* chunk = monitor_chunks(); chunk != nullptr; chunk = chunk->next()) {
-    if (chunk->contains(adr)) return true;
-  }
-
-  return false;
+  return is_in_full_stack(adr);
 }
 
 oop JavaThread::exception_oop() const {
@@ -1067,22 +1059,6 @@ void JavaThread::set_exception_oop(oop o) {
   Atomic::store(&_exception_oop, o);
 }
 
-void JavaThread::add_monitor_chunk(MonitorChunk* chunk) {
-  chunk->set_next(monitor_chunks());
-  set_monitor_chunks(chunk);
-}
-
-void JavaThread::remove_monitor_chunk(MonitorChunk* chunk) {
-  guarantee(monitor_chunks() != nullptr, "must be non empty");
-  if (monitor_chunks() == chunk) {
-    set_monitor_chunks(chunk->next());
-  } else {
-    MonitorChunk* prev = monitor_chunks();
-    while (prev->next() != chunk) prev = prev->next();
-    prev->set_next(chunk->next());
-  }
-}
-
 void JavaThread::handle_special_runtime_exit_condition() {
   if (is_obj_deopt_suspend()) {
     frame_anchor()->make_walkable();
@@ -1408,13 +1384,6 @@ void JavaThread::oops_do_no_frames(OopClosure* f, NMethodClosure* cf) {
 
   DEBUG_ONLY(verify_frame_info();)
 
-  if (has_last_Java_frame()) {
-    // Traverse the monitor chunks
-    for (MonitorChunk* chunk = monitor_chunks(); chunk != nullptr; chunk = chunk->next()) {
-      chunk->oops_do(f);
-    }
-  }
-
   assert(vframe_array_head() == nullptr, "deopt in progress at a safepoint!");
   // If we have deferred set_locals there might be oops waiting to be
   // written
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 6b6c9139b78eb..2541aaded00a3 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -52,6 +52,7 @@
 class AsyncExceptionHandshake;
 class ContinuationEntry;
 class DeoptResourceMark;
+class InternalOOMEMark;
 class JNIHandleBlock;
 class JVMCIRuntime;
 
@@ -192,10 +193,6 @@ class JavaThread: public Thread {
   void pop_jni_handle_block();
 
  private:
-  MonitorChunk* _monitor_chunks;              // Contains the off stack monitors
-                                              // allocated during deoptimization
-                                              // and by JNI_MonitorEnter/Exit
-
   enum SuspendFlags {
     // NOTE: avoid using the sign-bit as cc generates different test code
     //       when the sign-bit is used, and sometimes incorrectly - see CR 6398077
@@ -335,6 +332,8 @@ class JavaThread: public Thread {
   // of _attaching_via_jni and transitions to _attached_via_jni.
   volatile JNIAttachStates _jni_attach_state;
 
+  // In scope of an InternalOOMEMark?
+  bool _is_in_internal_oome_mark;
 
 #if INCLUDE_JVMCI
   // The _pending_* fields below are used to communicate extra information
@@ -350,10 +349,6 @@ class JavaThread: public Thread {
   // Specifies if the DeoptReason for the last uncommon trap was Reason_transfer_to_interpreter
   bool      _pending_transfer_to_interpreter;
 
-  // True if in a runtime call from compiled code that will deoptimize
-  // and re-execute a failed heap allocation in the interpreter.
-  bool      _in_retryable_allocation;
-
   // An id of a speculation that JVMCI compiled code can use to further describe and
   // uniquely identify the speculative optimization guarded by an uncommon trap.
   // See JVMCINMethodData::SPECULATION_LENGTH_BITS for further details.
@@ -680,7 +675,7 @@ class JavaThread: public Thread {
     return (_suspend_flags & (_obj_deopt JFR_ONLY(| _trace_flag))) != 0;
   }
 
-  // Fast-locking support
+  // Stack-locking support (not for LM_LIGHTWEIGHT)
   bool is_lock_owned(address adr) const;
 
   // Accessors for vframe array top
@@ -718,6 +713,10 @@ class JavaThread: public Thread {
   MemRegion deferred_card_mark() const           { return _deferred_card_mark; }
   void set_deferred_card_mark(MemRegion mr)      { _deferred_card_mark = mr;   }
 
+  // Is thread in scope of an InternalOOMEMark?
+  bool is_in_internal_oome_mark() const          { return _is_in_internal_oome_mark; }
+  void set_is_in_internal_oome_mark(bool b)      { _is_in_internal_oome_mark = b;    }
+
 #if INCLUDE_JVMCI
   jlong pending_failed_speculation() const        { return _pending_failed_speculation; }
   void set_pending_monitorenter(bool b)           { _pending_monitorenter = b; }
@@ -727,9 +726,6 @@ class JavaThread: public Thread {
   void set_jvmci_alternate_call_target(address a) { assert(_jvmci._alternate_call_target == nullptr, "must be"); _jvmci._alternate_call_target = a; }
   void set_jvmci_implicit_exception_pc(address a) { assert(_jvmci._implicit_exception_pc == nullptr, "must be"); _jvmci._implicit_exception_pc = a; }
 
-  virtual bool in_retryable_allocation() const    { return _in_retryable_allocation; }
-  void set_in_retryable_allocation(bool b)        { _in_retryable_allocation = b; }
-
   JVMCIRuntime* libjvmci_runtime() const          { return _libjvmci_runtime; }
   void set_libjvmci_runtime(JVMCIRuntime* rt) {
     assert((_libjvmci_runtime == nullptr && rt != nullptr) || (_libjvmci_runtime != nullptr && rt == nullptr), "must be");
@@ -881,13 +877,7 @@ class JavaThread: public Thread {
   int depth_first_number() { return _depth_first_number; }
   void set_depth_first_number(int dfn) { _depth_first_number = dfn; }
 
- private:
-  void set_monitor_chunks(MonitorChunk* monitor_chunks) { _monitor_chunks = monitor_chunks; }
-
  public:
-  MonitorChunk* monitor_chunks() const           { return _monitor_chunks; }
-  void add_monitor_chunk(MonitorChunk* chunk);
-  void remove_monitor_chunk(MonitorChunk* chunk);
   bool in_deopt_handler() const                  { return _in_deopt_handler > 0; }
   void inc_in_deopt_handler()                    { _in_deopt_handler++; }
   void dec_in_deopt_handler() {
diff --git a/src/hotspot/share/runtime/monitorChunk.cpp b/src/hotspot/share/runtime/monitorChunk.cpp
index c54ad685cdbbb..d18fc21d78d93 100644
--- a/src/hotspot/share/runtime/monitorChunk.cpp
+++ b/src/hotspot/share/runtime/monitorChunk.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -30,7 +30,6 @@
 MonitorChunk::MonitorChunk(int number_on_monitors) {
   _number_of_monitors = number_on_monitors;
   _monitors           = NEW_C_HEAP_ARRAY(BasicObjectLock, number_on_monitors, mtSynchronizer);
-  _next               = nullptr;
 }
 
 
diff --git a/src/hotspot/share/runtime/monitorChunk.hpp b/src/hotspot/share/runtime/monitorChunk.hpp
index f16aa46fa6411..5c804b5c595ef 100644
--- a/src/hotspot/share/runtime/monitorChunk.hpp
+++ b/src/hotspot/share/runtime/monitorChunk.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -38,23 +38,17 @@ class MonitorChunk: public CHeapObj<mtSynchronizer> {
   int              _number_of_monitors;
   BasicObjectLock* _monitors;
   BasicObjectLock* monitors() const { return _monitors; }
-  MonitorChunk*    _next;
  public:
   // Constructor
   MonitorChunk(int number_on_monitors);
   ~MonitorChunk();
 
-  // link operations
-  MonitorChunk* next() const                { return _next; }
-  void set_next(MonitorChunk* next)         { _next = next; }
-
   // Returns the number of monitors
   int number_of_monitors() const { return _number_of_monitors; }
 
   // Returns the index'th monitor
   BasicObjectLock* at(int index)            { assert(index >= 0 && index < number_of_monitors(), "out of bounds check"); return &monitors()[index]; }
 
-
   // Memory management
   void oops_do(OopClosure* f);
 
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index f8d4b32315665..27b4163238aa9 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -1056,7 +1056,9 @@ intptr_t ObjectSynchronizer::FastHashCode(Thread* current, oop obj) {
       }
       // Fall thru so we only have one place that installs the hash in
       // the ObjectMonitor.
-    } else if (LockingMode == LM_LEGACY && mark.has_locker() && current->is_lock_owned((address)mark.locker())) {
+    } else if (LockingMode == LM_LEGACY && mark.has_locker()
+               && current->is_Java_thread()
+               && JavaThread::cast(current)->is_lock_owned((address)mark.locker())) {
       // This is a stack-lock owned by the calling thread so fetch the
       // displaced markWord from the BasicLock on the stack.
       temp = mark.displaced_mark_helper();
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 396f349a8856b..d98fcf6f664a2 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/cdsConfig.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/javaThreadStatus.hpp"
 #include "gc/shared/barrierSet.hpp"
@@ -103,7 +104,10 @@ Thread::Thread() {
   _vm_error_callbacks = nullptr;
 
   // thread-specific hashCode stream generator state - Marsaglia shift-xor form
-  _hashStateX = os::random();
+  // If we are dumping, keep ihashes constant. Note that during dumping we only
+  // ever run one java thread, and no other thread should generate ihashes either,
+  // so using a constant seed should work fine.
+  _hashStateX = CDSConfig::is_dumping_static_archive() ? 0x12345678 : os::random();
   _hashStateY = 842502087;
   _hashStateZ = 0x8767;    // (int)(3579807591LL & 0xffff) ;
   _hashStateW = 273326509;
@@ -527,16 +531,6 @@ void Thread::print_owned_locks_on(outputStream* st) const {
 }
 #endif // ASSERT
 
-// We had to move these methods here, because vm threads get into ObjectSynchronizer::enter
-// However, there is a note in JavaThread::is_lock_owned() about the VM threads not being
-// used for compilation in the future. If that change is made, the need for these methods
-// should be revisited, and they should be removed if possible.
-
-bool Thread::is_lock_owned(address adr) const {
-  assert(LockingMode != LM_LIGHTWEIGHT, "should not be called with new lightweight locking");
-  return is_in_full_stack(adr);
-}
-
 bool Thread::set_as_starting_thread() {
   assert(_starting_thread == nullptr, "already initialized: "
          "_starting_thread=" INTPTR_FORMAT, p2i(_starting_thread));
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index a3d6e091d28fa..d0749b8101d85 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -210,14 +210,6 @@ class Thread: public ThreadShadow {
   DEBUG_ONLY(bool _indirectly_safepoint_thread;)
 
  public:
-  // Determines if a heap allocation failure will be retried
-  // (e.g., by deoptimizing and re-executing in the interpreter).
-  // In this case, the failed allocation must raise
-  // Universe::out_of_memory_error_retry() and omit side effects
-  // such as JVMTI events and handling -XX:+HeapDumpOnOutOfMemoryError
-  // and -XX:OnOutOfMemoryError.
-  virtual bool in_retryable_allocation() const { return false; }
-
 #ifdef ASSERT
   void set_suspendible_thread()   { _suspendible_thread = true; }
   void clear_suspendible_thread() { _suspendible_thread = false; }
@@ -483,9 +475,6 @@ class Thread: public ThreadShadow {
   }
 
  public:
-  // Used by fast lock support
-  virtual bool is_lock_owned(address adr) const;
-
   // Check if address is within the given range of this thread's
   // stack:  stack_base() > adr >= limit
   bool is_in_stack_range_incl(address adr, address limit) const {
diff --git a/src/hotspot/share/runtime/vframeArray.cpp b/src/hotspot/share/runtime/vframeArray.cpp
index cf7b087887fbd..d3bbbc283992a 100644
--- a/src/hotspot/share/runtime/vframeArray.cpp
+++ b/src/hotspot/share/runtime/vframeArray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -37,6 +37,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/monitorChunk.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vframeArray.hpp"
 #include "runtime/vframe_hp.hpp"
@@ -48,11 +49,10 @@
 
 int vframeArrayElement:: bci(void) const { return (_bci == SynchronizationEntryBCI ? 0 : _bci); }
 
-void vframeArrayElement::free_monitors(JavaThread* jt) {
+void vframeArrayElement::free_monitors() {
   if (_monitors != nullptr) {
      MonitorChunk* chunk = _monitors;
      _monitors = nullptr;
-     jt->remove_monitor_chunk(chunk);
      delete chunk;
   }
 }
@@ -72,7 +72,7 @@ void vframeArrayElement::fill_in(compiledVFrame* vf, bool realloc_failures) {
   int index;
 
   {
-    Thread* current_thread = Thread::current();
+    JavaThread* current_thread = JavaThread::current();
     ResourceMark rm(current_thread);
     HandleMark hm(current_thread);
 
@@ -85,7 +85,6 @@ void vframeArrayElement::fill_in(compiledVFrame* vf, bool realloc_failures) {
 
       // Allocate monitor chunk
       _monitors = new MonitorChunk(list->length());
-      vf->thread()->add_monitor_chunk(_monitors);
 
       // Migrate the BasicLocks from the stack to the monitor chunk
       for (index = 0; index < list->length(); index++) {
@@ -95,9 +94,16 @@ void vframeArrayElement::fill_in(compiledVFrame* vf, bool realloc_failures) {
         if (monitor->owner_is_scalar_replaced()) {
           dest->set_obj(nullptr);
         } else {
-          assert(monitor->owner() == nullptr || !monitor->owner()->is_unlocked(), "object must be null or locked");
+          assert(monitor->owner() != nullptr, "monitor owner must not be null");
+          assert(!monitor->owner()->is_unlocked(), "monitor must be locked");
           dest->set_obj(monitor->owner());
+          assert(ObjectSynchronizer::current_thread_holds_lock(current_thread, Handle(current_thread, dest->obj())),
+                 "should be held, before move_to");
+
           monitor->lock()->move_to(monitor->owner(), dest->lock());
+
+          assert(ObjectSynchronizer::current_thread_holds_lock(current_thread, Handle(current_thread, dest->obj())),
+                 "should be held, after move_to");
         }
       }
     }
@@ -308,7 +314,11 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters,
     top = iframe()->previous_monitor_in_interpreter_frame(top);
     BasicObjectLock* src = _monitors->at(index);
     top->set_obj(src->obj());
+    assert(src->obj() != nullptr || ObjectSynchronizer::current_thread_holds_lock(thread, Handle(thread, src->obj())),
+           "should be held, before move_to");
     src->lock()->move_to(src->obj(), top->lock());
+    assert(src->obj() != nullptr || ObjectSynchronizer::current_thread_holds_lock(thread, Handle(thread, src->obj())),
+           "should be held, after move_to");
   }
   if (ProfileInterpreter) {
     iframe()->interpreter_frame_set_mdp(0); // clear out the mdp.
@@ -649,9 +659,8 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller
 }
 
 void vframeArray::deallocate_monitor_chunks() {
-  JavaThread* jt = JavaThread::current();
   for (int index = 0; index < frames(); index++ ) {
-     element(index)->free_monitors(jt);
+     element(index)->free_monitors();
   }
 }
 
diff --git a/src/hotspot/share/runtime/vframeArray.hpp b/src/hotspot/share/runtime/vframeArray.hpp
index 734703a94ae6f..b270046252dba 100644
--- a/src/hotspot/share/runtime/vframeArray.hpp
+++ b/src/hotspot/share/runtime/vframeArray.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -77,7 +77,7 @@ class vframeArrayElement {
 
   MonitorChunk* monitors(void) const { return _monitors; }
 
-  void free_monitors(JavaThread* jt);
+  void free_monitors();
 
   StackValueCollection* locals(void) const             { return _locals; }
 
diff --git a/src/hotspot/share/utilities/chunkedList.hpp b/src/hotspot/share/utilities/chunkedList.hpp
index 81898ac53b268..9a600e4ce1b50 100644
--- a/src/hotspot/share/utilities/chunkedList.hpp
+++ b/src/hotspot/share/utilities/chunkedList.hpp
@@ -44,7 +44,7 @@ template <class T, MEMFLAGS F> class ChunkedList : public CHeapObj<F> {
   }
 
  public:
-  ChunkedList<T, F>() : _top(_values), _next_used(nullptr), _next_free(nullptr) {}
+  ChunkedList() : _top(_values), _next_used(nullptr), _next_free(nullptr) {}
 
   bool is_full() const {
     return _top == end();
diff --git a/src/hotspot/share/utilities/events.hpp b/src/hotspot/share/utilities/events.hpp
index 0aefbbefd2bb1..4470002a1e367 100644
--- a/src/hotspot/share/utilities/events.hpp
+++ b/src/hotspot/share/utilities/events.hpp
@@ -99,7 +99,7 @@ template <class T> class EventLogBase : public EventLog {
   EventRecord<T>* _records;
 
  public:
-  EventLogBase<T>(const char* name, const char* handle, int length = LogEventsBufferEntries):
+  EventLogBase(const char* name, const char* handle, int length = LogEventsBufferEntries):
     _mutex(Mutex::event, name),
     _name(name),
     _handle(handle),
diff --git a/src/hotspot/share/utilities/istream.cpp b/src/hotspot/share/utilities/istream.cpp
new file mode 100644
index 0000000000000..cb082128c62ca
--- /dev/null
+++ b/src/hotspot/share/utilities/istream.cpp
@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "memory/allocation.inline.hpp"
+#include "runtime/orderAccess.hpp"
+#include "utilities/istream.hpp"
+#include "utilities/ostream.hpp"
+#include "utilities/xmlstream.hpp"
+
+#ifndef ASSERT
+#define COV(casen) {}
+#else //ASSERT
+// Support for coverage testing.  Used by the gtest.
+/* $ sed < istream.cpp '/^.* COV(\([A-Z][^)]*\)).*$/!d;s//COV_FN(\1)/' |
+     tr '\12' ' ' | fold -sw72 | sed 's| $||;s|.*|  & \\|'
+  */
+#define DO_COV_CASES(COV_FN) \
+  COV_FN(NXT_L) COV_FN(NXT_N) COV_FN(FIB_P) COV_FN(FIB_E) COV_FN(FIB_N) \
+  COV_FN(FIB_L) COV_FN(PFB_C) COV_FN(PFB_P) COV_FN(PFB_A) \
+  COV_FN(PFB_G) COV_FN(PFB_H) COV_FN(SBC_C) COV_FN(SBC_B) COV_FN(SBC_N) \
+  COV_FN(SBC_L) COV_FN(EXB_R) COV_FN(EXB_A)
+  /**/
+#define COV_COUNT(casename) coverage_case_##casename
+#define DECLARE_COV_CASE(casename) static int COV_COUNT(casename);
+DO_COV_CASES(DECLARE_COV_CASE)
+#undef DECLARE_COV_CASE
+
+static int current_coverage_mode = 0;
+#define COV(casename) {                                 \
+    if (current_coverage_mode != 0) {                   \
+      COV_COUNT(casename)++;                            \
+    }                                                  }
+#endif //ASSERT
+
+bool inputStream::next() {
+  // We have to look at the current line first, just in case nobody
+  // actually called current_line() or done().
+  preload();
+  if (definitely_done()) {
+    return false;         // OK to call this->next() after done is true
+  }
+  // current line is at buffer[beg..end]; now skip past its '\0'
+  assert(have_current_line(), "");
+
+  set_buffer_content(_next, _content_end);
+  if (!need_to_read()) {  // any next line was already in the buffer
+    COV(NXT_L);
+    assert(have_current_line(), "");
+    return true;
+  } else {                // go back to the source for more
+    COV(NXT_N);
+    return fill_buffer();
+  }
+}
+
+void inputStream::set_done() {
+  size_t end = _beg = _end = _content_end;
+  _next = end + NEXT_PHANTOM;
+  _line_ending = 0;
+  assert(definitely_done(), "");
+}
+
+void inputStream::set_error(bool error_condition) {
+  if (error_condition) {
+    set_done();
+    _input_state = IState::ERR_STATE;
+    assert(error(), "");
+  } else if (error()) {
+    _input_state = definitely_done() ? IState::EOF_STATE : IState::NTR_STATE;
+  }
+}
+
+void inputStream::clear_buffer() {
+  _content_end = _beg = _end = _next = 0;
+  _line_ending = 0;
+}
+
+const char* inputStream::next_content(size_t& next_content_length) const {
+  assert(is_sane(), "");
+  size_t len = buffered_content_length(false);
+  next_content_length = len;
+  return len == 0 ? "" : &_buffer[_next];
+}
+
+void inputStream::set_input(inputStream::Input* input) {
+  clear_buffer();
+  _input = input;
+  _input_state = IState::NTR_STATE;
+}
+
+bool inputStream::fill_buffer() {
+  size_t fill_offset, fill_length;
+  assert(!definitely_done(), "");  // caller responsibility
+  while (need_to_read()) {
+    prepare_to_fill_buffer(fill_offset, fill_length);
+    if (error())  return false;
+    assert(fill_length > 0, "");
+    assert(fill_offset < _buffer_size, "");
+    assert(fill_offset + fill_length <= _buffer_size, "");
+    size_t nr = 0;
+    if (_input != nullptr && _input_state == IState::NTR_STATE) {
+      nr = _input->read(&_buffer[fill_offset], fill_length);
+      if (nr == 0)  _input_state = IState::EOF_STATE;  // do not get EOF twice
+    }
+    bool last_partial = false;
+    if (nr > 0) {
+      fill_offset += nr;
+    } else if (_beg == _end) {  // no partial line, so end it now
+      // we hit the end of the file (or there was never anything there)
+      COV(FIB_P);
+      assert(!definitely_done(), "");
+      set_done();
+      assert(definitely_done(), "");
+      return false;
+    } else {
+      // pretend to read a newline, to complete the last partial line
+      COV(FIB_E);
+      _buffer[fill_offset++] = '\n';  // insert phantom newline
+      last_partial = true;
+    }
+    set_buffer_content(_beg, fill_offset);
+    assert(!definitely_done(), "");
+    if (need_to_read()) { COV(FIB_N); }
+    else                { COV(FIB_L); }
+    if (last_partial) {
+      assert(have_current_line(), "");
+      _line_ending = 0;
+      _content_end -= 1;  // reverse insertion of phantom newline
+      assert(_next == _content_end + NEXT_PHANTOM, "");
+      assert(have_current_line(), "");
+    }
+  }
+  return true;
+}
+
+// Find some space in the buffer for reading.  If there is already a
+// partial line in the buffer, new space must follow it immediately.
+// The partial line is between _beg and _end, and no other parts of
+// the buffer are in use.
+void inputStream::prepare_to_fill_buffer(size_t& fill_offset,
+                                         size_t& fill_length) {
+  assert(need_to_read(), "");  // _next pointer out of the way
+  size_t end = _content_end;
+  if (_beg == end) { // if no partial line present...
+    COV(PFB_C);
+    clear_buffer();
+    fill_offset = 0;
+    fill_length = _buffer_size;
+    return;   // use the whole buffer
+  }
+  // at this point we have a pending line that needs more input
+  if (_beg > 0 && (_input != nullptr || end == _buffer_size)) {
+    COV(PFB_P);
+    // compact the buffer by overwriting characters from previous lines
+    size_t shift_left = _beg;
+    ::memmove(_buffer, _buffer + shift_left, _content_end - _beg);
+    _beg -= shift_left;
+    _end -= shift_left;
+    _next -= shift_left;
+    _content_end -= shift_left;
+    end = _content_end;
+  }
+  if (end < _buffer_size) {
+    COV(PFB_A);
+    fill_offset = end;
+    fill_length = _buffer_size - end;
+    return;   // use the whole buffer except partial line at the beginning
+  }
+  // the whole buffer contains a partial line, which means we must expand
+  COV(PFB_G);
+  size_t new_size = (_buffer_size < BIG_SIZE ? BIG_SIZE
+                     : _buffer_size + _buffer_size / 2);
+  assert(new_size > _buffer_size, "");
+  if (expand_buffer(new_size)) {
+    COV(PFB_H);
+    fill_offset = end;
+    fill_length = _buffer_size - end;
+    return;   // use the expanded buffer, except the partial line
+  }
+  // no recovery from failed allocation; just set the error state and bail
+  set_error();
+}
+
+// The only buffer content is between the given offsets.
+// Set _beg, _end, _next, and _content_end appropriately.
+void inputStream::set_buffer_content(size_t content_start,
+                                     size_t content_end) {
+  assert(content_end <= _buffer_size, "");
+  assert(content_start <= content_end + NEXT_PHANTOM, "");
+  if (content_start >= content_end) {   // empty content; clear buffer
+    COV(SBC_C);
+    clear_buffer();
+    return;
+  }
+  COV(SBC_B);
+  size_t content_len = content_end - content_start;
+  _beg = content_start;
+  _content_end = content_end;
+
+  // this is where we scan for newlines
+  char* nl = (char*) memchr(&_buffer[content_start], '\n', content_len);
+  if (nl == nullptr) {
+    COV(SBC_N);
+    _next = _end = content_end;
+    _line_ending = 0;
+    assert(need_to_read(), "");
+  } else {
+    COV(SBC_L);
+    *nl = '\0';  // so that this->current_line() will work
+    ++_line_count;
+    size_t end = nl - &_buffer[0];
+    _next = end + 1;
+    assert(_next != _content_end + NEXT_PHANTOM, "");
+    if (end > content_start && nl[-1] == '\r') { // yuck
+      // again, for this->current_line(), remove '\r' before '\n'
+      nl[-1] = '\0';
+      --end;
+      // Note: we could treat '\r' alone as a line ending on some
+      // platforms, but that is way too much work.  Newline '\n' is
+      // supported everywhere, and some tools insist on accompanying
+      // it with return as well, so we remove that.  But return '\r'
+      // by itself is an obsolete format, and also inconsistent with
+      // outputStream, which standarizes on '\n' and never emits '\r'.
+      // Postel's law suggests that we write '\n' only and grudgingly
+      // accept '\r' before '\n'.
+    }
+    _end = end;  // now this->current_line() points to buf[beg..end]
+    _line_ending = (int)(_next - end);
+    assert(have_current_line(), "");
+    assert(current_line() == &_buffer[_beg], "");
+    assert(current_line_length() == _end - _beg, "");
+  }
+}
+
+// Return true iff we expanded the buffer to the given length.
+bool inputStream::expand_buffer(size_t new_length) {
+  assert(new_length > _buffer_size, "");
+  char* new_buf = nullptr;
+  assert(new_length > sizeof(_small_buffer), "");
+  if (_buffer == &_small_buffer[0]) {
+    // fresh alloc from c-heap
+    COV(EXB_A);
+    new_buf = NEW_C_HEAP_ARRAY(char, new_length, mtInternal);
+    assert(new_buf != nullptr, "would have exited VM if OOM");
+    if (_content_end > 0) {
+      assert(_content_end <= _buffer_size, "");
+      ::memcpy(new_buf, _buffer, _content_end);  // copy only the active content
+    }
+  } else {
+    // realloc
+    COV(EXB_R);
+    new_buf = REALLOC_C_HEAP_ARRAY(char, _buffer, new_length, mtInternal);
+    assert(new_buf != nullptr, "would have exited VM if OOM");
+  }
+
+  if (new_buf == nullptr) {
+    return false;   // do not further update _buffer etc.
+  }
+  _buffer = new_buf;
+  _buffer_size = new_length;
+  return true;
+}
+
+inputStream::~inputStream() {
+  if (has_c_heap_buffer()) {
+    FreeHeap(_buffer);
+    DEBUG_ONLY(_buffer = (char*)((uintptr_t)0xdeadbeef)); // sanity
+  }
+}
+
+#ifdef ASSERT
+void inputStream::dump(const char* what) {
+  int diff = (int)(_end - _beg);
+  if (!_buffer || _beg > _buffer_size || _end > _buffer_size)
+    diff = 0;
+
+  bool ntr = (_next == _end),
+       hcl = (_beg < _content_end && _end < _next),
+       ddn = (_beg == _content_end && _next > _content_end);
+  tty->print_cr("%s%sistream %s%s%s%s%s [%d<%.*s>%d/%d..%d] LE=%d,"
+                " B=%llx%s[%d], LN=%d, CH=%d",
+                what ? what : "", what ? ": " : "",
+                _buffer == nullptr ? "U" : "",
+                ntr ? "R" : "",
+                hcl ? "L" : "",
+                ddn ? "D" : "",
+                (_next < _content_end ? "" :
+                 _next == _content_end ? "N" : "P"),
+                (int)_beg,
+                diff < 0 ? 0 : diff > 10 ? 10 : diff,
+                _buffer ? &_buffer[_beg] : "",
+                (int)_end, (int)_next, (int)_content_end,
+                _line_ending,
+                (unsigned long long)(intptr_t)_buffer,
+                _buffer == _small_buffer ? "(SB)" : "",
+                (int)_buffer_size,
+                (int)_line_count,
+                has_c_heap_buffer());
+  assert(is_sane(), "");
+}
+#endif
+
+#ifdef ASSERT
+// More support for coverage testing.
+int inputStream::coverage_mode(int start,
+                               int& cases, int& total, int& zeroes) {
+  int old_mode = current_coverage_mode;
+  current_coverage_mode = start;
+  int num_cases = 0, zero_count = 0, case_count = 0;
+#define COUNT_COV_CASE(casename) {              \
+    int tem = COV_COUNT(casename);              \
+    case_count += tem;                          \
+    if (tem == 0)  ++zero_count;                \
+    num_cases++;                                \
+  }
+  DO_COV_CASES(COUNT_COV_CASE)
+#undef COUNT_COV_CASE
+  if (start < 0) {
+    tty->print("istream coverage:");
+    #define PRINT_COV_CASE(casename) \
+      tty->print(" %s:%d", #casename, COV_COUNT(casename));
+    DO_COV_CASES(PRINT_COV_CASE)
+    tty->cr();
+    #undef PRINT_COV_CASE
+    if (zero_count != 0) {
+      case_count = -case_count;
+      #define ZERO_COV_CASE(casename)                  \
+        if (COV_COUNT(casename) == 0)                  \
+          tty->print_cr("%s: no coverage for %s",      \
+                        __FILE__, #casename);          \
+      DO_COV_CASES(ZERO_COV_CASE)
+      #undef ZERO_COV_CASE
+    }
+  }
+  if (start >= 2 || start < 0) {
+    #define CLEAR_COV_CASE(casename) \
+       COV_COUNT(casename) = 0;
+    DO_COV_CASES(CLEAR_COV_CASE)
+    #undef CLEAR_COV_CASE
+  }
+  cases  = num_cases;
+  total  = case_count;
+  zeroes = zero_count;
+  return old_mode;
+}
+#endif //ASSERT
diff --git a/src/hotspot/share/utilities/istream.hpp b/src/hotspot/share/utilities/istream.hpp
new file mode 100644
index 0000000000000..b6a58055b937c
--- /dev/null
+++ b/src/hotspot/share/utilities/istream.hpp
@@ -0,0 +1,386 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_UTILITIES_ISTREAM_HPP
+#define SHARE_UTILITIES_ISTREAM_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
+
+// Input streams for reading line-oriented textual data. These streams
+// treat newline '\n' very differently from all other bytes.  Carriage
+// return '\r' is just another bit of whitespace, although it is
+// removed just before newline.
+//
+// Null '\0' is just a data byte, although it also terminates C
+// strings; the `current_line` function adds a null after removing any
+// line terminator but does not specially process any nulls embedded
+// in the line.
+//
+// There are sizing access functions which allow lines to contain
+// null, but the simpler function assumes null termination, and thus
+// lines containing null will "look" shorter when viewed as C strings.
+// Use the sizing access functions if you care about this.
+//
+// Formatting guidelines:
+//
+// Configuration data should be line-oriented.  It should be readable
+// by humans (though perhaps with difficulty).  It should be easily
+// processed by text editors and by widely available text processing
+// tools such as grep, sed, and awk.
+//
+// Configuration data should not require "compilers" to generate, if
+// possible.  It should be editable by hand, if possible.  In cases
+// where binary data is strongly required, pick a binary format
+// already native to Hotspot, such as classfile, jar, or jmod.
+//
+// Each line should be separately parseable; the parsing can be ad
+// hoc.  For constructs inherently larger than single lines (such as
+// complex method configuration information), try to use a structuring
+// principle that allows "leaf" data to be line-oriented, and delimits
+// that data with markup lines of some sort.  Try to pick a
+// line-friendly version of a standard format like XML or Markdown.
+// JSON is somewhat problematic because there is no line-friendly leaf
+// syntax: everything at the leaves must be a quoted string in JSON.
+//
+// Use simple parsing via scanf-like formats for simple applications.
+// But, keep in mind that these formats may lose data when applied to
+// unusual strings, such as class names that contain spaces, or method
+// names that contain punctuation.  For more robust transmission of
+// potentially unusual names, consider wrapping them in XML-flavored
+// lines like <tag attr='pay load'/>.
+//
+// Note: Input streams are never MT-safe.
+
+class inputStream : public CHeapObjBase {
+ public:
+  class Input;
+
+ private:
+  NONCOPYABLE(inputStream);
+
+  static constexpr size_t SMALL_SIZE =  240 DEBUG_ONLY(*0 + 10);
+  static constexpr size_t BIG_SIZE   = 2048 DEBUG_ONLY(*0 + 20);
+
+ protected:
+  // Values for _input_state, to distinguish some phases of history:
+  // Do we need to read more input (NTR)?  Did we see EOF already?
+  // Was there an error getting input or allocating buffer space?
+  enum class IState : int { NTR_STATE, EOF_STATE, ERR_STATE };
+
+  // Named offset for _next relative to _content_end, of phantom '\n'.
+  static const int NEXT_PHANTOM = 1;
+
+  Input* _input;   // where the input comes from or else nullptr
+  IState _input_state;  // one of {NTR,EOF,ERR}_STATE
+  char   _line_ending;  // one of {0,1,2} for "", "\n", "\r\n"
+  char*  _buffer;       // scratch buffer holding at least the current line
+  size_t _buffer_size;  // allocated size of buffer
+  size_t _content_end;  // offset to end of valid contents of buffer
+  size_t _beg;          // offset in buffer to start of current line
+  size_t _end;          // offset to end of known current line (else content_end)
+  size_t _next;         // offset to known start of next line (else =end)
+  size_t _line_count;   // increasing non-resettable count of lines read
+  char   _small_buffer[SMALL_SIZE];  // stack-allocated buffer for holding lines;
+                                     // will switch to C_HEAP allocation when necessary.
+
+  bool has_c_heap_buffer() {
+    return _buffer != &_small_buffer[0];
+  }
+
+  // Buffer states
+  //
+  // The current line (less any line ending) is always [beg..end).
+  // It is always the case that 0 <= beg <= end <= con_end <= buffer_size.
+  // When there is a current line buffered, end < next <= 1+con_end.
+  // In that case, the value of next is end + max(1, strlen(lend)),
+  // where lend is "\n", "\r\n", or (for a last partial line) "".
+  // But if next == end, we need to read more input, or observe an EOF.
+  //
+  //   beg ==end ==next ==  con_end => nothing buffered, we need to read
+  //   beg <=end < next <=  con_end => have current line, with terminator
+  //   beg < end < next ==1+con_end => have partial current line (saw EOF)
+  //   beg < end ==next ==  con_end => partial line, we need to read
+  //   beg ==end < next ==1+con_end => definitely done; no more I/O
+  //
+  // These states are in three mutually exclusive groups:
+  //   need_to_read()      <= nothing or partial line in buffer
+  //   have_current_line() <= beg/end point to valid line (partial only if EOF)
+  //   definitely_done()   <= consumed all lines && (hit EOF || hit error)
+  // These states are internal; the user can only look at next/done/error.
+  //
+  // Relative to these states, everything already read from the input
+  // before the first byte of the current line is logically present
+  // (but not accessible) before _beg, while everything not yet read
+  // from the input is after _content_end.  The difference between
+  // these two pointers is constant, except when characters change
+  // from being in the current line to being (logically) before it,
+  // when next is called.
+
+  bool is_sane() const {
+    assert(_buffer != nullptr, "");
+    assert(_content_end <= _buffer_size, "");
+    assert(_beg <= _end && _end <= _content_end, "");
+    assert(_end <= _next && _next <= _content_end + NEXT_PHANTOM, "");
+    assert(_buffer_size == 0 || _next <= _buffer_size, "");
+    return true;
+  }
+
+  bool need_to_read() const {
+    assert(is_sane(), "");
+    return _next == _end;
+  }
+  bool have_current_line() const {
+    assert(is_sane(), "");
+    // _beg < _content_end because there is an \0 (was \n) at _end,
+    // or else it is a non-empty partial line and the \0 is at
+    // _content_end.  In either case, if _end == _next we are
+    // still searching for more input.
+    return (_beg < _content_end && _end < _next);
+  }
+  bool definitely_done() const {
+    assert(is_sane(), "");
+    // If _beg < _content_end we still have a line of some sort.
+    // Otherwise, if _next > _content_end, we have seen EOF or error.
+    return (_beg == _content_end && _next > _content_end);
+  }
+
+  // Reset indexes within the buffer to point to no content.
+  void clear_buffer();
+
+  // Reset indexes within the buffer to point to the given content.
+  // This is where we scan for newlines as well.
+  void set_buffer_content(size_t content_start, size_t content_end);
+
+  // Try to make the buffer bigger.  This may be necessary in order to
+  // buffer a very long line.  Returns false if there was an
+  // allocation failure.
+  //
+  // On allocation failure, just make do with whatever buffer there
+  // was to start with; the caller must check for this condition and
+  // avoid buffering more data in the non-expanded buffer.  However,
+  // the buffer will always be non-null, so at least one line can be
+  // buffered, if it is of normal size.
+  bool expand_buffer(size_t new_length);
+
+  // Make sure there is at least one line in the buffer, and set
+  // _beg/_end to indicate where it is.  Any content before _beg can
+  // be overwritten to make more room in the buffer.  If there is no
+  // more input, set the state up to indicate we are done.
+  bool fill_buffer();
+
+  // Find some room in the buffer so we can call read on it.
+  // This might call expand_buffer but will try not to.
+  // The assumption is that read already buffers slow I/O calls.
+  // The purpose for the small buffer managed here is to store whole lines,
+  // and perhaps edit them in-place.
+  void prepare_to_fill_buffer(size_t& fill_offset, size_t& fill_length);
+
+  // Quick check for an initially incomplete buffer...
+  void preload() const {
+    if (need_to_read()) {
+      const_cast<inputStream*>(this)->fill_buffer();
+    }
+  }
+
+  // How much content is buffered (if any) after the current line?
+  size_t buffered_content_length(bool include_current) const {
+    return (include_current       ? _content_end - _beg :
+            _content_end >= _next ? _content_end - _next : 0);
+  }
+
+  // Returns a pointer and count to characters buffered after the
+  // current line, but not yet read from my input source.  Only useful
+  // if you are trying to stack input streams on top of each other
+  // somehow.  You can also ask the input source if it thinks it has
+  // more bytes.
+  const char* next_content(size_t& next_content_length) const;
+
+ public:
+  // Create an empty input stream.
+  // Call push_back_input or set_input to configure.
+  inputStream() :
+    _input(nullptr),
+    _input_state(IState::NTR_STATE),
+    _line_ending(0),
+    _buffer(&_small_buffer[0]),
+    _buffer_size(sizeof(_small_buffer)),
+    _content_end(0),
+    _beg(0),
+    _end(0),
+    _next(0),
+    _line_count(0) {}
+
+  // Take input from the given source.  Buffer only a modest amount.
+  inputStream(Input* input)
+    : inputStream()
+  {
+    set_input(input);
+  }
+
+  virtual ~inputStream();
+
+  // Discards any previous input and sets the given input source.
+  void set_input(Input* input);
+
+  // Returns a pointer to a null terminated mutable copy of the current line.
+  // Note that embedded nulls may make the line appear shorter than it really is.
+  // This may trigger input activity if there is not enough data buffered.
+  // If there are no more lines, return an empty line, statically allocated.
+  char* current_line() const {
+    preload();
+    if (definitely_done())
+      return (char*)"";
+    return &_buffer[_beg];
+  }
+
+  // Return the size of the current line, exclusive of any line terminator.
+  // If no lines have been read yet, or there are none remaining, return zero.
+  size_t current_line_length() const {
+    preload();
+    return _end - _beg;
+  }
+
+  // Reports my current input source, if any, else a null pointer.
+  Input* input() const { return _input; }
+
+  // Discards the current line, gets ready to report the next line.
+  // Returns true if there is one, which is always the opposite of done().
+  // Fetches input if necessary.
+  bool next();
+
+  // Reports if there are no more lines.  Fetches input if necessary.
+  bool done() const  {
+    preload();
+    return definitely_done();
+  }
+
+  // Discard pending input and do not read any more.
+  // Takes no action if already done, whether in an error state or not.
+  void set_done();
+
+  // Reports if this stream has had an error was reported on it.
+  bool error() const {
+    return _input_state == IState::ERR_STATE;
+  }
+
+  // Set this stream done with an error, if the argument is true.
+  // If it is false but there is an error condition, clear the error.
+  // Otherwise do nothing.
+  void set_error(bool error_condition = true);
+
+  // lineno is the 1-based ordinal of the current line; it starts at one
+  size_t lineno() const         { preload(); return _line_count; }
+
+  // Copy the current line to the given output stream.
+  void print_on(outputStream* out);
+
+  // Copy the current line to the given output stream, and also call cr().
+  void print_cr_on(outputStream* out) {
+    print_on(out); out->cr();
+  }
+
+#ifdef ASSERT
+  void dump(const char* what = nullptr);
+  static int coverage_mode(int mode, int& cases, int& total, int& zeroes);
+#else
+  void dump(const char* what = nullptr) { }
+#endif
+
+
+  // Block-oriented input, which treats all bytes equally.
+  class Input : public CHeapObjBase {
+  public:
+    // Read some characters from an external source into the line buffer.
+    // If there are no more, return zero, otherwise return non-zero.
+    // It must be OK to call read even after it returns zero.
+    virtual size_t read(char* buf, size_t size) = 0;
+    // Example: read(b,s) { return fread(b, 1, s, _my_fp); }
+    // Example: read(b,s) { return 0; } // never more than the initial buffer
+  };
+};
+
+// for reading lines from files
+class FileInput : public inputStream::Input {
+  NONCOPYABLE(FileInput);
+
+ protected:
+  fileStream& _fs;
+  fileStream _private_fs;
+
+  // it does not seem likely there are such file streams around
+  FileInput(fileStream& fs)
+    : _fs(fs)
+  { }
+
+ public:
+  // just forward all the constructor arguments to the wrapped line-input class
+  template<typename... Arg>
+  FileInput(Arg... arg)
+    : _fs(_private_fs), _private_fs(arg...)
+  { }
+
+  FileInput(const char* file_name)
+    : FileInput(file_name, "rt")
+  { }
+
+  bool is_open() const { return _fs.is_open(); }
+
+ protected:
+  size_t read(char* buf, size_t size) override {
+    return _fs.read(buf, size);
+  }
+};
+
+class MemoryInput : public inputStream::Input {
+  const void* _base;
+  const size_t _limit;
+  size_t      _offset;
+
+ public:
+  MemoryInput(const void* base, size_t size,
+              size_t offset = 0)
+    : _base(base), _limit(size), _offset(offset) {}
+
+  MemoryInput(const char* start)
+    : MemoryInput(start, 0, strlen(start))
+  { }
+
+ protected:
+  size_t read(char* buf, size_t size) override {
+    size_t nr = size;
+    if (nr > _limit - _offset) {
+      nr = _limit - _offset;
+    }
+    if (nr > 0) {
+      ::memcpy(buf, (char*)_base + _offset, nr);
+      _offset += nr;
+    }
+    return nr;
+  }
+};
+
+#endif // SHARE_UTILITIES_ISTREAM_HPP
diff --git a/src/hotspot/share/utilities/linkedlist.hpp b/src/hotspot/share/utilities/linkedlist.hpp
index 5b8e258d53914..eec7ea1e48d90 100644
--- a/src/hotspot/share/utilities/linkedlist.hpp
+++ b/src/hotspot/share/utilities/linkedlist.hpp
@@ -82,7 +82,7 @@ template <class E> class LinkedListNode : public AnyObj {
 template <class E> class LinkedList : public AnyObj {
  protected:
   LinkedListNode<E>*    _head;
-  NONCOPYABLE(LinkedList<E>);
+  NONCOPYABLE(LinkedList);
 
  public:
   LinkedList() : _head(nullptr) { }
diff --git a/src/hotspot/share/utilities/ostream.cpp b/src/hotspot/share/utilities/ostream.cpp
index a1575b3d2c6c8..89335f9cf4c62 100644
--- a/src/hotspot/share/utilities/ostream.cpp
+++ b/src/hotspot/share/utilities/ostream.cpp
@@ -397,7 +397,7 @@ char* stringStream::as_string(bool c_heap) const {
   char* copy = c_heap ?
     NEW_C_HEAP_ARRAY(char, _written + 1, mtInternal) : NEW_RESOURCE_ARRAY(char, _written + 1);
   ::memcpy(copy, _buffer, _written);
-  copy[_written] = 0;  // terminating null
+  copy[_written] = '\0';  // terminating null
   if (c_heap) {
     // Need to ensure our content is written to memory before we return
     // the pointer to it.
@@ -590,23 +590,10 @@ long fileStream::fileSize() {
   return size;
 }
 
-char* fileStream::readln(char *data, int count ) {
-  char * ret = nullptr;
-  if (_file != nullptr) {
-    ret = ::fgets(data, count, _file);
-    // Get rid of annoying \n char only if it is present.
-    size_t len = ::strlen(data);
-    if (len > 0 && data[len - 1] == '\n') {
-      data[len - 1] = '\0';
-    }
-  }
-  return ret;
-}
-
 fileStream::~fileStream() {
   if (_file != nullptr) {
-    if (_need_close) fclose(_file);
-    _file      = nullptr;
+    close();
+    _file = nullptr;
   }
 }
 
diff --git a/src/hotspot/share/utilities/ostream.hpp b/src/hotspot/share/utilities/ostream.hpp
index 72cf804ed646d..d39fca29ba4c0 100644
--- a/src/hotspot/share/utilities/ostream.hpp
+++ b/src/hotspot/share/utilities/ostream.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -242,11 +242,20 @@ class fileStream : public outputStream {
   ~fileStream();
   bool is_open() const { return _file != nullptr; }
   virtual void write(const char* c, size_t len);
-  size_t read(void *data, size_t size, size_t count) { return _file != nullptr ? ::fread(data, size, count, _file) : 0; }
-  char* readln(char *data, int count);
-  int eof() { return _file != nullptr ? feof(_file) : -1; }
+  // unlike other classes in this file, fileStream can perform input as well as output
+  size_t read(void* data, size_t size) {
+    if (_file == nullptr)  return 0;
+    return ::fread(data, 1, size, _file);
+  }
+  size_t read(void *data, size_t size, size_t count) {
+    return read(data, size * count);
+  }
+  void close() {
+    if (_file == nullptr || !_need_close)  return;
+    fclose(_file);
+    _need_close = false;
+  }
   long fileSize();
-  void rewind() { if (_file != nullptr) ::rewind(_file); }
   void flush();
 };
 
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index ae1c65b9f935d..5e28b9ce95b7c 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -191,8 +191,9 @@ private System() {
      */
     public static final PrintStream err = null;
 
-    // Holder for the initial value of `in`, set within `initPhase1()`.
-    private static InputStream initialIn;
+    // Initial values of System.in and System.err, set in initPhase1().
+    private static @Stable InputStream initialIn;
+    private static @Stable PrintStream initialErr;
 
     // indicates if a security manager is possible
     private static final int NEVER = 1;
@@ -355,9 +356,6 @@ private static class CallersHolder {
             = Collections.synchronizedMap(new WeakHashMap<>());
     }
 
-    // Remember initial System.err. setSecurityManager() warning goes here
-    private static volatile @Stable PrintStream initialErrStream;
-
     private static URL codeSource(Class<?> clazz) {
         PrivilegedAction<ProtectionDomain> pa = clazz::getProtectionDomain;
         @SuppressWarnings("removal")
@@ -417,7 +415,7 @@ public static void setSecurityManager(@SuppressWarnings("removal") SecurityManag
                 } else {
                     source = callerClass.getName() + " (" + url + ")";
                 }
-                initialErrStream.printf("""
+                initialErr.printf("""
                         WARNING: A terminally deprecated method in java.lang.System has been called
                         WARNING: System::setSecurityManager has been called by %s
                         WARNING: Please consider reporting this to the maintainers of %s
@@ -2200,7 +2198,8 @@ private static void initPhase1() {
         // thus they are equivalent to Console.charset(), otherwise the encodings
         // of those properties default to native.encoding
         setOut0(newPrintStream(fdOut, props.getProperty("stdout.encoding")));
-        setErr0(newPrintStream(fdErr, props.getProperty("stderr.encoding")));
+        initialErr = newPrintStream(fdErr, props.getProperty("stderr.encoding"));
+        setErr0(initialErr);
 
         // Setup Java signal handlers for HUP, TERM, and INT (where available).
         Terminator.setup();
@@ -2406,8 +2405,6 @@ private static void initPhase3() {
                     notSupportedJnuEncoding);
         }
 
-        initialErrStream = System.err;
-
         // initializing the system class loader
         VM.initLevel(3);
 
@@ -2598,6 +2595,10 @@ public InputStream initialSystemIn() {
                 return initialIn;
             }
 
+            public PrintStream initialSystemErr() {
+                return initialErr;
+            }
+
             public void setCause(Throwable t, Throwable cause) {
                 t.setCause(cause);
             }
diff --git a/src/java.base/share/classes/java/lang/classfile/TypeKind.java b/src/java.base/share/classes/java/lang/classfile/TypeKind.java
index bf2435f43ef0e..5ba566b3d0672 100644
--- a/src/java.base/share/classes/java/lang/classfile/TypeKind.java
+++ b/src/java.base/share/classes/java/lang/classfile/TypeKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -58,7 +58,7 @@ public enum TypeKind {
 
     private final String name;
     private final String descriptor;
-    private final int newarraycode;
+    private final int newarrayCode;
 
     /** {@return the human-readable name corresponding to this type} */
     public String typeName() { return name; }
@@ -66,9 +66,12 @@ public enum TypeKind {
     /** {@return the field descriptor character corresponding to this type} */
     public String descriptor() { return descriptor; }
 
-    /** {@return the code used by the {@code newarray} opcode corresponding to this type} */
-    public int newarraycode() {
-        return newarraycode;
+    /**
+     * {@return the code used by the {@code newarray} opcode corresponding to this type}
+     * @since 23
+     */
+    public int newarrayCode() {
+        return newarrayCode;
     }
 
     /**
@@ -94,19 +97,21 @@ public TypeKind asLoadable() {
         };
     }
 
-    TypeKind(String name, String descriptor, int newarraycode) {
+    TypeKind(String name, String descriptor, int newarrayCode) {
         this.name = name;
         this.descriptor = descriptor;
-        this.newarraycode = newarraycode;
+        this.newarrayCode = newarrayCode;
     }
 
     /**
      * {@return the type kind associated with the array type described by the
      * array code used as an operand to {@code newarray}}
-     * @param newarraycode the operand of the {@code newarray} instruction
+     * @param newarrayCode the operand of the {@code newarray} instruction
+     * @throws IllegalArgumentException if the code is invalid
+     * @since 23
      */
-    public static TypeKind fromNewArrayCode(int newarraycode) {
-        return switch (newarraycode) {
+    public static TypeKind fromNewarrayCode(int newarrayCode) {
+        return switch (newarrayCode) {
             case 4 -> TypeKind.BooleanType;
             case 5 -> TypeKind.CharType;
             case 6 -> TypeKind.FloatType;
@@ -115,15 +120,19 @@ public static TypeKind fromNewArrayCode(int newarraycode) {
             case 9 -> TypeKind.ShortType;
             case 10 -> TypeKind.IntType;
             case 11 -> TypeKind.LongType;
-            default -> throw new IllegalArgumentException("Bad new array code: " + newarraycode);
+            default -> throw new IllegalArgumentException("Bad newarray code: " + newarrayCode);
         };
     }
 
     /**
      * {@return the type kind associated with the specified field descriptor}
      * @param s the field descriptor
+     * @throws IllegalArgumentException only if the descriptor is not valid
      */
     public static TypeKind fromDescriptor(CharSequence s) {
+        if (s.isEmpty()) { // implicit null check
+            throw new IllegalArgumentException("Empty descriptor");
+        }
         return switch (s.charAt(0)) {
             case '[', 'L' -> TypeKind.ReferenceType;
             case 'B' -> TypeKind.ByteType;
@@ -144,6 +153,8 @@ public static TypeKind fromDescriptor(CharSequence s) {
      * @param descriptor the field descriptor
      */
     public static TypeKind from(TypeDescriptor.OfField<?> descriptor) {
-        return fromDescriptor(descriptor.descriptorString());
+        return descriptor.isPrimitive() // implicit null check
+                ? fromDescriptor(descriptor.descriptorString())
+                : TypeKind.ReferenceType;
     }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
index a67a0f21c0883..ae3f465402d0f 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -56,7 +56,7 @@ public sealed interface NewPrimitiveArrayInstruction extends Instruction
      */
     static NewPrimitiveArrayInstruction of(TypeKind typeKind) {
         // Implicit null-check:
-        if (typeKind.newarraycode() < 0) {
+        if (typeKind.newarrayCode() < 0) {
             throw new IllegalArgumentException("Illegal component type: " + typeKind.typeName());
         }
         return new AbstractInstruction.UnboundNewPrimitiveArrayInstruction(typeKind);
diff --git a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
index 19a193a924a0a..46eeb67de54c5 100644
--- a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
+++ b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
@@ -28,7 +28,6 @@
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.Opcodes;
 import sun.invoke.util.Wrapper;
-import sun.util.logging.PlatformLogger;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -73,6 +72,7 @@ static class HolderClassBuilder {
 
         private final TreeSet<String> speciesTypes = new TreeSet<>();
         private final TreeSet<String> invokerTypes = new TreeSet<>();
+        private final TreeSet<String> linkerTypes = new TreeSet<>();
         private final TreeSet<String> callSiteTypes = new TreeSet<>();
         private final Map<String, Set<String>> dmhMethods = new TreeMap<>();
 
@@ -87,6 +87,12 @@ HolderClassBuilder addInvokerType(String methodType) {
             return this;
         }
 
+        HolderClassBuilder addLinkerType(String methodType) {
+            validateMethodType(methodType);
+            linkerTypes.add(methodType);
+            return this;
+        }
+
         HolderClassBuilder addCallSiteType(String csType) {
             validateMethodType(csType);
             callSiteTypes.add(csType);
@@ -130,19 +136,33 @@ Map<String, byte[]> build() {
                 }
             }
 
-            // The invoker type to ask for is retrieved by removing the first
+            // The linker type to ask for is retrieved by removing the first
             // and the last argument, which needs to be of Object.class
+            MethodType[] linkerMethodTypes = new MethodType[linkerTypes.size()];
+            index = 0;
+            for (String linkerType : linkerTypes) {
+                MethodType mt = asMethodType(linkerType);
+                final int lastParam = mt.parameterCount() - 1;
+                if (!checkLinkerTypeParams(mt)) {
+                    throw new RuntimeException(
+                            "Linker type parameter must start and end with Object: " + linkerType);
+                }
+                mt = mt.dropParameterTypes(lastParam, lastParam + 1);
+                linkerMethodTypes[index] = mt.dropParameterTypes(0, 1);
+                index++;
+            }
+
+            // The invoker type to ask for is retrieved by removing the first
+            // argument, which needs to be of Object.class
             MethodType[] invokerMethodTypes = new MethodType[invokerTypes.size()];
             index = 0;
             for (String invokerType : invokerTypes) {
                 MethodType mt = asMethodType(invokerType);
-                final int lastParam = mt.parameterCount() - 1;
                 if (!checkInvokerTypeParams(mt)) {
                     throw new RuntimeException(
-                            "Invoker type parameter must start and end with Object: " + invokerType);
+                            "Invoker type parameter must start with 2 Objects: " + invokerType);
                 }
-                mt = mt.dropParameterTypes(lastParam, lastParam + 1);
-                invokerMethodTypes[index] = mt.dropParameterTypes(0, 1);
+                invokerMethodTypes[index] = mt.dropParameterTypes(0, 2);
                 index++;
             }
 
@@ -171,7 +191,7 @@ Map<String, byte[]> build() {
                             DELEGATING_HOLDER, directMethodTypes));
             result.put(INVOKERS_HOLDER,
                        generateInvokersHolderClassBytes(INVOKERS_HOLDER,
-                            invokerMethodTypes, callSiteMethodTypes));
+                            linkerMethodTypes, invokerMethodTypes, callSiteMethodTypes));
             result.put(BASIC_FORMS_HOLDER,
                        generateBasicFormsClassBytes(BASIC_FORMS_HOLDER));
 
@@ -207,6 +227,12 @@ public static MethodType asMethodType(String basicSignatureString) {
         }
 
         public static boolean checkInvokerTypeParams(MethodType mt) {
+            return (mt.parameterCount() >= 2 &&
+                    mt.parameterType(0) == Object.class &&
+                    mt.parameterType(1) == Object.class);
+        }
+
+        public static boolean checkLinkerTypeParams(MethodType mt) {
             final int lastParam = mt.parameterCount() - 1;
             return (mt.parameterCount() >= 2 &&
                     mt.parameterType(0) == Object.class &&
@@ -320,15 +346,11 @@ static Map<String, byte[]> generateHolderClasses(Stream<String> traces)  {
                                 if ("linkToTargetMethod".equals(parts[2]) ||
                                         "linkToCallSite".equals(parts[2])) {
                                     builder.addCallSiteType(methodType);
+                                } else if (parts[2].endsWith("nvoker")) {
+                                    // MH.exactInvoker exactInvoker MH.invoker invoker
+                                    builder.addInvokerType(methodType);
                                 } else {
-                                    MethodType mt = HolderClassBuilder.asMethodType(methodType);
-                                    // Work around JDK-8327499
-                                    if (HolderClassBuilder.checkInvokerTypeParams(mt)) {
-                                        builder.addInvokerType(methodType);
-                                    } else {
-                                        PlatformLogger.getLogger("java.lang.invoke")
-                                                .warning("Invalid LF_RESOLVE " + parts[1] + " " + parts[2] + " " + parts[3]);
-                                    }
+                                    builder.addLinkerType(methodType);
                                 }
                             } else if (parts[1].contains("DirectMethodHandle")) {
                                 String dmh = parts[2];
@@ -465,27 +487,27 @@ static byte[] generateDelegatingMethodHandleHolderClassBytes(String className,
 
     /**
      * Returns a {@code byte[]} representation of a class implementing
-     * the invoker forms for the set of supplied {@code invokerMethodTypes}
-     * and {@code callSiteMethodTypes}.
+     * the invoker forms for the set of supplied {@code linkerMethodTypes}
+     * {@code invokerMethodTypes}, and {@code callSiteMethodTypes}.
      */
     static byte[] generateInvokersHolderClassBytes(String className,
-            MethodType[] invokerMethodTypes, MethodType[] callSiteMethodTypes) {
+            MethodType[] linkerMethodTypes, MethodType[] invokerMethodTypes,
+            MethodType[] callSiteMethodTypes) {
 
         HashSet<MethodType> dedupSet = new HashSet<>();
         ArrayList<LambdaForm> forms = new ArrayList<>();
         ArrayList<String> names = new ArrayList<>();
-        int[] types = {
-            MethodTypeForm.LF_EX_LINKER,
+
+        int[] invokerTypes = {
             MethodTypeForm.LF_EX_INVOKER,
-            MethodTypeForm.LF_GEN_LINKER,
-            MethodTypeForm.LF_GEN_INVOKER
+            MethodTypeForm.LF_GEN_INVOKER,
         };
 
-        for (int i = 0; i < invokerMethodTypes.length; i++) {
+        for (MethodType methodType : invokerMethodTypes) {
             // generate methods representing invokers of the specified type
-            if (dedupSet.add(invokerMethodTypes[i])) {
-                for (int type : types) {
-                    LambdaForm invokerForm = Invokers.invokeHandleForm(invokerMethodTypes[i],
+            if (dedupSet.add(methodType)) {
+                for (int type : invokerTypes) {
+                    LambdaForm invokerForm = Invokers.invokeHandleForm(methodType,
                             /*customized*/false, type);
                     forms.add(invokerForm);
                     names.add(invokerForm.kind.defaultLambdaName);
@@ -493,6 +515,24 @@ static byte[] generateInvokersHolderClassBytes(String className,
             }
         }
 
+        int[] linkerTypes = {
+                MethodTypeForm.LF_EX_LINKER,
+                MethodTypeForm.LF_GEN_LINKER,
+        };
+
+        dedupSet = new HashSet<>();
+        for (MethodType methodType : linkerMethodTypes) {
+            // generate methods representing linkers of the specified type
+            if (dedupSet.add(methodType)) {
+                for (int type : linkerTypes) {
+                    LambdaForm linkerForm = Invokers.invokeHandleForm(methodType,
+                            /*customized*/false, type);
+                    forms.add(linkerForm);
+                    names.add(linkerForm.kind.defaultLambdaName);
+                }
+            }
+        }
+
         dedupSet = new HashSet<>();
         for (int i = 0; i < callSiteMethodTypes.length; i++) {
             // generate methods representing invokers of the specified type
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 0f8474ec12d48..ae6c4af5ec56c 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -48,6 +48,7 @@
 import java.text.DateFormat;
 import java.text.MessageFormat;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 import java.util.spi.LocaleNameProvider;
 import java.util.stream.Stream;
 
@@ -980,29 +981,36 @@ static Locale getInstance(String language, String script, String country,
         return getInstance(baseloc, extensions);
     }
 
+
     static Locale getInstance(BaseLocale baseloc, LocaleExtensions extensions) {
         if (extensions == null) {
             Locale locale = CONSTANT_LOCALES.get(baseloc);
             if (locale != null) {
                 return locale;
             }
-            return LOCALE_CACHE.computeIfAbsent(baseloc, Locale::createLocale);
+            return LOCALE_CACHE.computeIfAbsent(baseloc, LOCALE_CREATOR);
         } else {
             LocaleKey key = new LocaleKey(baseloc, extensions);
-            return LOCALE_CACHE.computeIfAbsent(key, Locale::createLocale);
+            return LOCALE_CACHE.computeIfAbsent(key, LOCALE_CREATOR);
         }
     }
 
-    private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE = ReferencedKeyMap.create(true, ConcurrentHashMap::new);
-    private static Locale createLocale(Object key) {
-        if (key instanceof BaseLocale base) {
-            return new Locale(base, null);
+    private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE
+            = ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier());
+
+    private static final Function<Object, Locale> LOCALE_CREATOR = new Function<>() {
+        @Override
+        public Locale apply(Object key) {
+            if (key instanceof BaseLocale base) {
+                return new Locale(base, null);
+            }
+            LocaleKey lk = (LocaleKey)key;
+            return new Locale(lk.base, lk.exts);
         }
-        LocaleKey lk = (LocaleKey)key;
-        return new Locale(lk.base, lk.exts);
-    }
+    };
 
     private static final class LocaleKey {
+
         private final BaseLocale base;
         private final LocaleExtensions exts;
         private final int hash;
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/Lock.java b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
index 84100e64a13dd..bd6ce2eb6f919 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
@@ -80,11 +80,11 @@
  *
  * <pre> {@code
  * Lock l = ...;
- * l.lock();
+ * l.lock(); // lock() as the last statement before the try block
  * try {
  *   // access the resource protected by this lock
  * } finally {
- *   l.unlock();
+ *   l.unlock(); // unlock() as the first statement in the finally block
  * }}</pre>
  *
  * When locking and unlocking occur in different scopes, care must be
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
index c58925b086e6d..3378ce3983aa1 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
@@ -71,8 +71,9 @@
  * is available even if other threads are waiting.
  *
  * <p>It is recommended practice to <em>always</em> immediately
- * follow a call to {@code lock} with a {@code try} block, most
- * typically in a before/after construction such as:
+ * follow a call to {@code lock} with a {@code try} block, and
+ * to <em>always</em> immediately call {@code unlock} as the
+ * first statement in the finally block, as follows:
  *
  * <pre> {@code
  * class X {
@@ -80,11 +81,11 @@
  *   // ...
  *
  *   public void m() {
- *     lock.lock();  // block until condition holds
+ *     lock.lock();  // lock() as the last statement before the try block
  *     try {
  *       // ... method body
  *     } finally {
- *       lock.unlock();
+ *       lock.unlock(); // unlock() as the first statement in the finally block
  *     }
  *   }
  * }}</pre>
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
index c73bd41cea87a..517708e70f3f2 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
@@ -141,6 +141,7 @@
  *
  *   void processCachedData() {
  *     rwl.readLock().lock();
+ *     // Code between the lock() above, and the unlock() below must not throw
  *     if (!cacheValid) {
  *       // Must release read lock before acquiring write lock
  *       rwl.readLock().unlock();
@@ -158,7 +159,7 @@
  *         rwl.writeLock().unlock(); // Unlock write, still hold read
  *       }
  *     }
- *
+ *     // Make sure that code that could throw is executed inside the try block
  *     try {
  *       use(data);
  *     } finally {
diff --git a/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java b/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
index 7b7339e2772a8..a7c063713684b 100644
--- a/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
+++ b/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -142,8 +142,9 @@ private static class FactoryMapHolder {
          * @return Map of RandomGeneratorFactory classes.
          */
         private static Map<String, Provider<? extends RandomGenerator>> createFactoryMap() {
+            FactoryMapHolder.class.getModule().addUses(RandomGenerator.class);
             return ServiceLoader
-                .load(RandomGenerator.class)
+                .load(RandomGenerator.class, ClassLoader.getPlatformClassLoader())
                 .stream()
                 .filter(p -> !p.type().isInterface())
                 .collect(Collectors.toMap(p -> p.type().getSimpleName(), Function.identity()));
@@ -341,9 +342,6 @@ private void ensureConstructors() {
      * {@link RandomGenerator} that utilize the {@code name}
      * <a href="package-summary.html#algorithms">algorithm</a>.
      *
-     * @implSpec Availability is determined by RandomGeneratorFactory using the
-     * service provider API to locate implementations of the RandomGenerator interface.
-     *
      * @param name  Name of random number generator
      * <a href="package-summary.html#algorithms">algorithm</a>
      * @param <T> Sub-interface of {@link RandomGenerator} to produce
@@ -376,12 +374,9 @@ public static RandomGeneratorFactory<RandomGenerator> getDefault() {
 
     /**
      * Returns a non-empty stream of available {@link RandomGeneratorFactory RandomGeneratorFactory(s)}.
-     *
+     * <p>
      * RandomGenerators that are marked as deprecated are not included in the result.
      *
-     * @implSpec Availability is determined by RandomGeneratorFactory using the service provider API
-     * to locate implementations of the RandomGenerator interface.
-     *
      * @return a non-empty stream of all available {@link RandomGeneratorFactory RandomGeneratorFactory(s)}.
      */
     public static Stream<RandomGeneratorFactory<RandomGenerator>> all() {
@@ -615,5 +610,3 @@ public T create(byte[] seed) {
     }
 
 }
-
-
diff --git a/src/java.base/share/classes/java/util/random/package-info.java b/src/java.base/share/classes/java/util/random/package-info.java
index b4dfe28f796c4..2e16b319f44bb 100644
--- a/src/java.base/share/classes/java/util/random/package-info.java
+++ b/src/java.base/share/classes/java/util/random/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -50,9 +50,7 @@
  * <p> The principal supporting class is {@link RandomGeneratorFactory}. This
  * can be used to generate multiple random number generators for a specific
  * algorithm. {@link RandomGeneratorFactory} also provides methods for
- * selecting random number generator algorithms. RandomGeneratorFactory
- * registers implementations of {@link RandomGenerator} interface using the
- * service provider API.
+ * selecting random number generator algorithms.
  *
  * <p> An important subsidiary interface is
  * {@link RandomGenerator.StreamableGenerator}, which provides methods for
@@ -636,4 +634,3 @@
  * @since   17
  */
 package java.util.random;
-
diff --git a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
index 2bf0c711cfece..6ec8b2a149a81 100644
--- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
+++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
@@ -152,6 +152,11 @@
  * supported by the Java runtime environment. The following table lists the
  * version of CLDR used in each JDK release. Unless otherwise specified, all
  * update releases in a given JDK release family use the same CLDR version.
+ * Note that the CLDR locale data are subject to change. Users should not assume
+ * that the locale data remain the same across CLDR versions. Otherwise, unexpected
+ * incompatible behaviors may occur, such as an exception on parsing a date.
+ * Refer to <a href="https://cldr.unicode.org/index/downloads">CLDR Releases</a>
+ * for the deltas between their releases.
  * <table class="striped">
  * <caption style="display:none">JDK releases and supported CLDR versions</caption>
  * <thead>
@@ -264,7 +269,7 @@ public boolean isSupportedLocale(Locale locale) {
         for (Locale available : getAvailableLocales()) {
             if (locale.equals(available.stripExtensions())) {
                 return true;
-}
+            }
         }
         return false;
     }
diff --git a/src/java.base/share/classes/java/util/stream/StreamSpliterators.java b/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
index a098bb2f2acab..196cd76c8f821 100644
--- a/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
+++ b/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -248,6 +248,11 @@ public final int characteristics() {
                 c |= (spliterator.characteristics() & (Spliterator.SIZED | Spliterator.SUBSIZED));
             }
 
+            // It's not allowed for a Spliterator to report SORTED if not also ORDERED
+            if ((c & Spliterator.SORTED) != 0 && (c & Spliterator.ORDERED) == 0) {
+                c &= ~(Spliterator.SORTED);
+            }
+
             return c;
         }
 
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index af7ff2e4aa255..c31e745cd89a6 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -26,6 +26,7 @@
 package jdk.internal.access;
 
 import java.io.InputStream;
+import java.io.PrintStream;
 import java.lang.annotation.Annotation;
 import java.lang.foreign.MemorySegment;
 import java.lang.invoke.MethodHandle;
@@ -401,6 +402,11 @@ public interface JavaLangAccess {
      */
     InputStream initialSystemIn();
 
+    /**
+     * Returns the initial value of System.err.
+     */
+    PrintStream initialSystemErr();
+
     /**
      * Encodes ASCII codepoints as possible from the source array into
      * the destination byte array, assuming that the encoding is ASCII
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
index 4e9a55c77ac2c..e1598db154560 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
@@ -557,7 +557,7 @@ public BoundNewPrimitiveArrayInstruction(Opcode op, CodeImpl code, int pos) {
 
         @Override
         public TypeKind typeKind() {
-            return TypeKind.fromNewArrayCode(code.classReader.readU1(pos + 1));
+            return TypeKind.fromNewarrayCode(code.classReader.readU1(pos + 1));
         }
 
         @Override
@@ -1149,7 +1149,7 @@ public TypeKind typeKind() {
 
         @Override
         public void writeTo(DirectCodeBuilder writer) {
-            writer.writeNewPrimitiveArray(typeKind.newarraycode());
+            writer.writeNewPrimitiveArray(typeKind.newarrayCode());
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
index 5eee17573eed9..390ad1b2f97da 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
@@ -26,6 +26,7 @@
 package jdk.internal.foreign;
 
 import jdk.internal.vm.annotation.ForceInline;
+
 import java.lang.foreign.AddressLayout;
 import java.lang.foreign.GroupLayout;
 import java.lang.foreign.MemoryLayout;
@@ -204,10 +205,7 @@ public VarHandle dereferenceHandle(boolean adapt) {
                     String.format("Path does not select a value layout: %s", breadcrumbs()));
         }
 
-        // If we have an enclosing layout, drop the alignment check for the accessed element,
-        // we check the root layout instead
-        ValueLayout accessedLayout = enclosing != null ? valueLayout.withByteAlignment(1) : valueLayout;
-        VarHandle handle = accessedLayout.varHandle();
+        VarHandle handle = valueLayout.varHandle();
         handle = MethodHandles.collectCoordinates(handle, 1, offsetHandle());
 
         // we only have to check the alignment of the root layout for the first dereference we do,
diff --git a/src/java.base/share/classes/jdk/internal/misc/VM.java b/src/java.base/share/classes/jdk/internal/misc/VM.java
index 9b51cfad458a8..de6f011fe8ffd 100644
--- a/src/java.base/share/classes/jdk/internal/misc/VM.java
+++ b/src/java.base/share/classes/jdk/internal/misc/VM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -27,6 +27,7 @@
 
 import static java.lang.Thread.State.*;
 
+import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -496,4 +497,11 @@ private static class BufferPoolsHolder {
     public static List<BufferPool> getBufferPools() {
         return BufferPoolsHolder.BUFFER_POOLS;
     }
+
+    /**
+     * Return the initial value of System.err that was set during VM initialization.
+     */
+    public static PrintStream initialErr() {
+        return SharedSecrets.getJavaLangAccess().initialSystemErr();
+    }
 }
diff --git a/src/jdk.random/share/classes/jdk/random/L128X1024MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L128X1024MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
index 46f8a642d54ad..e6f4f896dc0bf 100644
--- a/src/jdk.random/share/classes/jdk/random/L128X1024MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L128X128MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L128X128MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
index ac12b96b4d227..d03fcfc086485 100644
--- a/src/jdk.random/share/classes/jdk/random/L128X128MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L128X256MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L128X256MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
index f34956e40a1e8..81440d7316a50 100644
--- a/src/jdk.random/share/classes/jdk/random/L128X256MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L32X64MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
similarity index 98%
rename from src/jdk.random/share/classes/jdk/random/L32X64MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
index 1b64a4b28cd92..0f6beea7bc796 100644
--- a/src/jdk.random/share/classes/jdk/random/L32X64MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L64X1024MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L64X1024MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
index 9ec81997bde05..e4eb82d450ef2 100644
--- a/src/jdk.random/share/classes/jdk/random/L64X1024MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L64X128MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
similarity index 98%
rename from src/jdk.random/share/classes/jdk/random/L64X128MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
index 4188e85e89f31..7dd757f312b1e 100644
--- a/src/jdk.random/share/classes/jdk/random/L64X128MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L64X128StarStarRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
similarity index 98%
rename from src/jdk.random/share/classes/jdk/random/L64X128StarStarRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
index 139b27223b678..15b9bc312da3a 100644
--- a/src/jdk.random/share/classes/jdk/random/L64X128StarStarRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L64X256MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L64X256MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
index 0c0cbb43687d8..bb605df5fdc87 100644
--- a/src/jdk.random/share/classes/jdk/random/L64X256MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/Xoroshiro128PlusPlus.java b/src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/Xoroshiro128PlusPlus.java
rename to src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
index ba8daaf724661..d20b3cf9e6afa 100644
--- a/src/jdk.random/share/classes/jdk/random/Xoroshiro128PlusPlus.java
+++ b/src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/Xoshiro256PlusPlus.java b/src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/Xoshiro256PlusPlus.java
rename to src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
index 5c9cc606597b1..fdefe02dd035d 100644
--- a/src/jdk.random/share/classes/jdk/random/Xoshiro256PlusPlus.java
+++ b/src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
index be392c3ae2ddf..9c364cd781350 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
@@ -99,6 +99,21 @@ public final class ReferencedKeyMap<K, V> implements Map<K, V> {
      */
     private final ReferenceQueue<K> stale;
 
+    /**
+     * @return a supplier to create a {@code ConcurrentHashMap} appropriate for use in the
+     *         create methods.
+     * @param <K> the type of keys maintained by the new map
+     * @param <V> the type of mapped values
+     */
+    public static <K, V> Supplier<Map<ReferenceKey<K>, V>> concurrentHashMapSupplier() {
+        return new Supplier<>() {
+            @Override
+            public Map<ReferenceKey<K>, V> get() {
+                return new ConcurrentHashMap<>();
+            }
+        };
+    }
+
     /**
      * Private constructor.
      *
diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
index 21b940439e00c..73ad6f326409d 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
@@ -75,6 +75,15 @@ public final class ReferencedKeySet<T> extends AbstractSet<T> {
      */
     final ReferencedKeyMap<T, ReferenceKey<T>> map;
 
+    /**
+     * @return a supplier to create a {@code ConcurrentHashMap} appropriate for use in the
+     *         create methods.
+     * @param <E> the type of elements maintained by this set
+     */
+    public static <E> Supplier<Map<ReferenceKey<E>, ReferenceKey<E>>> concurrentHashMapSupplier() {
+        return ReferencedKeyMap.concurrentHashMapSupplier();
+    }
+
     /**
      * Private constructor.
      *
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 17a66b856a1e4..edbbad78c9da9 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -268,8 +268,6 @@
         jdk.jfr;
     exports jdk.internal.util.xml.impl to
         jdk.jfr;
-    exports jdk.internal.util.random to
-        jdk.random;
     exports jdk.internal.util to
         java.desktop,
         java.prefs,
@@ -396,7 +394,6 @@
     uses java.time.chrono.AbstractChronology;
     uses java.time.chrono.Chronology;
     uses java.time.zone.ZoneRulesProvider;
-    uses java.util.random.RandomGenerator;
     uses java.util.spi.CalendarDataProvider;
     uses java.util.spi.CalendarNameProvider;
     uses java.util.spi.CurrencyNameProvider;
@@ -425,6 +422,16 @@
     provides java.util.random.RandomGenerator with
         java.security.SecureRandom,
         java.util.Random,
-        java.util.SplittableRandom;
+        java.util.SplittableRandom,
+        jdk.internal.random.L32X64MixRandom,
+        jdk.internal.random.L64X128MixRandom,
+        jdk.internal.random.L64X128StarStarRandom,
+        jdk.internal.random.L64X256MixRandom,
+        jdk.internal.random.L64X1024MixRandom,
+        jdk.internal.random.L128X128MixRandom,
+        jdk.internal.random.L128X256MixRandom,
+        jdk.internal.random.L128X1024MixRandom,
+        jdk.internal.random.Xoroshiro128PlusPlus,
+        jdk.internal.random.Xoshiro256PlusPlus;
 
 }
diff --git a/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
index 9f65e32fa27cd..0ce080c20547f 100644
--- a/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
+++ b/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -259,6 +259,24 @@ private static Locale getParentLocale(Locale locale) {
                     break;
                 }
             }
+
+            if (parent == null) {
+                // check nonlikelyScript locales
+                if (CLDRBaseLocaleDataMetaInfo.nonlikelyScript && locale.getCountry().isEmpty()) {
+                    var lang = " " + locale.getLanguage() + " ";
+                    var script= locale.getScript();
+                    if (!script.isEmpty()) {
+                        parent = baseMetaInfo.likelyScriptMap().entrySet().stream()
+                            .filter(e -> e.getValue().contains(lang))
+                            .findAny()
+                            .map(Map.Entry::getKey)
+                            .map(likely -> likely.equals(script) ? null : Locale.ROOT)
+                            .orElse(null);
+                    }
+                }
+            }
+
+            // no parent found
             if (parent == null) {
                 parent = locale; // non existent marker
             }
diff --git a/src/java.base/share/classes/sun/util/locale/BaseLocale.java b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
index 7e0fc9a2d3477..ec2a6a49183ca 100644
--- a/src/java.base/share/classes/sun/util/locale/BaseLocale.java
+++ b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
@@ -38,7 +38,7 @@
 import jdk.internal.vm.annotation.Stable;
 
 import java.util.StringJoiner;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.UnaryOperator;
 
 public final class BaseLocale {
 
@@ -93,7 +93,7 @@ public final class BaseLocale {
 
     // Interned BaseLocale cache
     private static final ReferencedKeySet<BaseLocale> CACHE =
-            ReferencedKeySet.create(true, ConcurrentHashMap::new);
+            ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
 
     public static final String SEP = "_";
 
@@ -164,13 +164,21 @@ public static BaseLocale getInstance(String language, String script,
         // "interned" instance can subsequently be used by the Locale
         // instance which guarantees the locale components are properly cased/interned.
         return CACHE.intern(new BaseLocale(language, script, region, variant),
-            (b) -> new BaseLocale(
-                LocaleUtils.toLowerString(b.language).intern(),
-                LocaleUtils.toTitleString(b.script).intern(),
-                LocaleUtils.toUpperString(b.region).intern(),
-                b.variant.intern()));
+                // Avoid lambdas since this may be on the bootstrap path in many locales
+                INTERNER);
     }
 
+    public static final UnaryOperator<BaseLocale> INTERNER = new UnaryOperator<>() {
+        @Override
+        public BaseLocale apply(BaseLocale b) {
+            return new BaseLocale(
+                    LocaleUtils.toLowerString(b.language).intern(),
+                    LocaleUtils.toTitleString(b.script).intern(),
+                    LocaleUtils.toUpperString(b.region).intern(),
+                    b.variant.intern());
+        }
+    };
+
     public static String convertOldISOCodes(String language) {
         return switch (language) {
             case "he", "iw" -> OLD_ISO_CODES ? "iw" : "he";
diff --git a/src/java.base/share/data/publicsuffixlist/VERSION b/src/java.base/share/data/publicsuffixlist/VERSION
index f86d2df03ca38..24f4407cc89ab 100644
--- a/src/java.base/share/data/publicsuffixlist/VERSION
+++ b/src/java.base/share/data/publicsuffixlist/VERSION
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/b5bf572c52988dbe9d865b8f090ea819024a9936/public_suffix_list.dat
-Date: 2023-11-09
+Github: https://raw.githubusercontent.com/publicsuffix/list/1cbd6e71a9b83620b1d0b11e49d3d9ff48c27e22/public_suffix_list.dat
+Date: 2024-05-07
diff --git a/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat b/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
index fff6e9a494d64..34733674ea00f 100644
--- a/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
+++ b/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
@@ -6710,7 +6710,7 @@ org.zw
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-11-03T15:13:18Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2024-05-04T15:12:50Z
 // This list is auto-generated, don't edit it manually.
 // aaa : American Automobile Association, Inc.
 // https://www.iana.org/domains/root/db/aaa.html
@@ -6896,7 +6896,7 @@ anquan
 // https://www.iana.org/domains/root/db/anz.html
 anz
 
-// aol : Oath Inc.
+// aol : Yahoo Inc.
 // https://www.iana.org/domains/root/db/aol.html
 aol
 
@@ -6988,10 +6988,6 @@ auto
 // https://www.iana.org/domains/root/db/autos.html
 autos
 
-// avianca : Avianca Inc.
-// https://www.iana.org/domains/root/db/avianca.html
-avianca
-
 // aws : AWS Registry LLC
 // https://www.iana.org/domains/root/db/aws.html
 aws
@@ -7016,10 +7012,6 @@ baidu
 // https://www.iana.org/domains/root/db/banamex.html
 banamex
 
-// bananarepublic : The Gap, Inc.
-// https://www.iana.org/domains/root/db/bananarepublic.html
-bananarepublic
-
 // band : Dog Beach, LLC
 // https://www.iana.org/domains/root/db/band.html
 band
@@ -7544,10 +7536,6 @@ college
 // https://www.iana.org/domains/root/db/cologne.html
 cologne
 
-// comcast : Comcast IP Holdings I, LLC
-// https://www.iana.org/domains/root/db/comcast.html
-comcast
-
 // commbank : COMMONWEALTH BANK OF AUSTRALIA
 // https://www.iana.org/domains/root/db/commbank.html
 commbank
@@ -7752,6 +7740,10 @@ dental
 // https://www.iana.org/domains/root/db/dentist.html
 dentist
 
+// desi
+// https://www.iana.org/domains/root/db/desi.html
+desi
+
 // design : Registry Services, LLC
 // https://www.iana.org/domains/root/db/design.html
 design
@@ -7796,7 +7788,7 @@ discover
 // https://www.iana.org/domains/root/db/dish.html
 dish
 
-// diy : Lifestyle Domain Holdings, Inc.
+// diy : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/diy.html
 diy
 
@@ -7928,10 +7920,6 @@ esq
 // https://www.iana.org/domains/root/db/estate.html
 estate
 
-// etisalat : Emirates Telecommunications Corporation (trading as Etisalat)
-// https://www.iana.org/domains/root/db/etisalat.html
-etisalat
-
 // eurovision : European Broadcasting Union (EBU)
 // https://www.iana.org/domains/root/db/eurovision.html
 eurovision
@@ -8104,7 +8092,7 @@ fly
 // https://www.iana.org/domains/root/db/foo.html
 foo
 
-// food : Lifestyle Domain Holdings, Inc.
+// food : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/food.html
 food
 
@@ -8164,7 +8152,7 @@ ftr
 // https://www.iana.org/domains/root/db/fujitsu.html
 fujitsu
 
-// fun : Radix FZC DMCC
+// fun : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/fun.html
 fun
 
@@ -8312,7 +8300,7 @@ goldpoint
 // https://www.iana.org/domains/root/db/golf.html
 golf
 
-// goo : NTT Resonant Inc.
+// goo : NTT DOCOMO, INC.
 // https://www.iana.org/domains/root/db/goo.html
 goo
 
@@ -8364,10 +8352,6 @@ grocery
 // https://www.iana.org/domains/root/db/group.html
 group
 
-// guardian : The Guardian Life Insurance Company of America
-// https://www.iana.org/domains/root/db/guardian.html
-guardian
-
 // gucci : Guccio Gucci S.p.a.
 // https://www.iana.org/domains/root/db/gucci.html
 gucci
@@ -8500,7 +8484,7 @@ horse
 // https://www.iana.org/domains/root/db/hospital.html
 hospital
 
-// host : Radix FZC DMCC
+// host : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/host.html
 host
 
@@ -8720,7 +8704,7 @@ jpmorgan
 // https://www.iana.org/domains/root/db/jprs.html
 jprs
 
-// juegos : Internet Naming Company LLC
+// juegos : Dog Beach, LLC
 // https://www.iana.org/domains/root/db/juegos.html
 juegos
 
@@ -8908,7 +8892,7 @@ life
 // https://www.iana.org/domains/root/db/lifeinsurance.html
 lifeinsurance
 
-// lifestyle : Lifestyle Domain Holdings, Inc.
+// lifestyle : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/lifestyle.html
 lifestyle
 
@@ -8948,7 +8932,7 @@ lipsy
 // https://www.iana.org/domains/root/db/live.html
 live
 
-// living : Lifestyle Domain Holdings, Inc.
+// living : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/living.html
 living
 
@@ -9392,10 +9376,6 @@ olayan
 // https://www.iana.org/domains/root/db/olayangroup.html
 olayangroup
 
-// oldnavy : The Gap, Inc.
-// https://www.iana.org/domains/root/db/oldnavy.html
-oldnavy
-
 // ollo : Dish DBS Corporation
 // https://www.iana.org/domains/root/db/ollo.html
 ollo
@@ -9416,7 +9396,7 @@ ong
 // https://www.iana.org/domains/root/db/onl.html
 onl
 
-// online : Radix FZC DMCC
+// online : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/online.html
 online
 
@@ -9620,7 +9600,7 @@ pramerica
 // https://www.iana.org/domains/root/db/praxi.html
 praxi
 
-// press : Radix FZC DMCC
+// press : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/press.html
 press
 
@@ -9928,10 +9908,6 @@ sbi
 // https://www.iana.org/domains/root/db/sbs.html
 sbs
 
-// sca : SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
-// https://www.iana.org/domains/root/db/sca.html
-sca
-
 // scb : The Siam Commercial Bank Public Company Limited ("SCB")
 // https://www.iana.org/domains/root/db/scb.html
 scb
@@ -10076,7 +10052,7 @@ sina
 // https://www.iana.org/domains/root/db/singles.html
 singles
 
-// site : Radix FZC DMCC
+// site : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/site.html
 site
 
@@ -10156,7 +10132,7 @@ soy
 // https://www.iana.org/domains/root/db/spa.html
 spa
 
-// space : Radix FZC DMCC
+// space : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/space.html
 space
 
@@ -10208,7 +10184,7 @@ stockholm
 // https://www.iana.org/domains/root/db/storage.html
 storage
 
-// store : Radix FZC DMCC
+// store : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/store.html
 store
 
@@ -10324,7 +10300,7 @@ tdk
 // https://www.iana.org/domains/root/db/team.html
 team
 
-// tech : Radix FZC DMCC
+// tech : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/tech.html
 tech
 
@@ -10508,7 +10484,7 @@ unicom
 // https://www.iana.org/domains/root/db/university.html
 university
 
-// uno : Radix FZC DMCC
+// uno : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/uno.html
 uno
 
@@ -10524,7 +10500,7 @@ ups
 // https://www.iana.org/domains/root/db/vacations.html
 vacations
 
-// vana : Lifestyle Domain Holdings, Inc.
+// vana : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/vana.html
 vana
 
@@ -10608,10 +10584,6 @@ vlaanderen
 // https://www.iana.org/domains/root/db/vodka.html
 vodka
 
-// volkswagen : Volkswagen Group of America Inc.
-// https://www.iana.org/domains/root/db/volkswagen.html
-volkswagen
-
 // volvo : Volvo Holding Sverige Aktiebolag
 // https://www.iana.org/domains/root/db/volvo.html
 volvo
@@ -10676,10 +10648,14 @@ webcam
 // https://www.iana.org/domains/root/db/weber.html
 weber
 
-// website : Radix FZC DMCC
+// website : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/website.html
 website
 
+// wed
+// https://www.iana.org/domains/root/db/wed.html
+wed
+
 // wedding : Registry Services, LLC
 // https://www.iana.org/domains/root/db/wedding.html
 wedding
@@ -10768,10 +10744,6 @@ xbox
 // https://www.iana.org/domains/root/db/xerox.html
 xerox
 
-// xfinity : Comcast IP Holdings I, LLC
-// https://www.iana.org/domains/root/db/xfinity.html
-xfinity
-
 // xihuan : Beijing Qihu Keji Co., Ltd.
 // https://www.iana.org/domains/root/db/xihuan.html
 xihuan
@@ -11012,10 +10984,6 @@ xin
 // https://www.iana.org/domains/root/db/xn--mgba7c0bbn0a.html
 العليان
 
-// xn--mgbaakc7dvf : Emirates Telecommunications Corporation (trading as Etisalat)
-// https://www.iana.org/domains/root/db/xn--mgbaakc7dvf.html
-اتصالات
-
 // xn--mgbab2bd : CORE Association
 // https://www.iana.org/domains/root/db/xn--mgbab2bd.html
 بازار
@@ -11152,7 +11120,7 @@ xyz
 // https://www.iana.org/domains/root/db/yachts.html
 yachts
 
-// yahoo : Oath Inc.
+// yahoo : Yahoo Inc.
 // https://www.iana.org/domains/root/db/yahoo.html
 yahoo
 
@@ -11217,6 +11185,12 @@ zuerich
 // ===BEGIN PRIVATE DOMAINS===
 // (Note: these are in alphabetical order by company name)
 
+// 12CHARS: https://12chars.com
+// Submitted by Kenny Niehage <psl@12chars.com>
+12chars.dev
+12chars.it
+12chars.pro
+
 // 1GB LLC : https://www.1gb.ua/
 // Submitted by 1GB LLC <noc@1gb.com.ua>
 cc.ua
@@ -11226,6 +11200,15 @@ ltd.ua
 // 611coin : https://611project.org/
 611.to
 
+// AAA workspace : https://aaa.vodka
+// Submitted by Kirill Rezraf <admin@aaa.vodka>
+aaa.vodka
+
+// A2 Hosting
+// Submitted by Tyler Hall <sysadmin@a2hosting.com>
+a2hosted.com
+cpserver.com
+
 // Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
 // Submitted by Aaron Marais <its_me@aaronleem.co.za>
 graphox.us
@@ -11242,12 +11225,18 @@ graphox.us
 // Submitted by Ofer Kalaora <postmaster@activetrail.com>
 activetrail.biz
 
+// Adaptable.io : https://adaptable.io
+// Submitted by Mark Terrel <support@adaptable.io>
+adaptable.app
+
 // Adobe : https://www.adobe.com/
 // Submitted by Ian Boston <boston@adobe.com> and Lars Trieloff <trieloff@adobe.com>
 adobeaemcloud.com
 *.dev.adobeaemcloud.com
+aem.live
 hlx.live
 adobeaemcloud.net
+aem.page
 hlx.page
 hlx3.page
 
@@ -11319,7 +11308,7 @@ myamaze.net
 
 // Amazon API Gateway
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 4d863337-ff98-4501-a6f2-361eba8445d6
+// Reference: 9e37648f-a66c-4655-9ab1-5981f8737197
 execute-api.cn-north-1.amazonaws.com.cn
 execute-api.cn-northwest-1.amazonaws.com.cn
 execute-api.af-south-1.amazonaws.com
@@ -11334,6 +11323,7 @@ execute-api.ap-southeast-2.amazonaws.com
 execute-api.ap-southeast-3.amazonaws.com
 execute-api.ap-southeast-4.amazonaws.com
 execute-api.ca-central-1.amazonaws.com
+execute-api.ca-west-1.amazonaws.com
 execute-api.eu-central-1.amazonaws.com
 execute-api.eu-central-2.amazonaws.com
 execute-api.eu-north-1.amazonaws.com
@@ -11360,23 +11350,28 @@ cloudfront.net
 
 // Amazon Cognito
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 7bee1013-f456-47df-bfe8-03c78d946d61
+// Reference: 09588633-91fe-49d8-b4e7-ec36496d11f3
 auth.af-south-1.amazoncognito.com
 auth.ap-northeast-1.amazoncognito.com
 auth.ap-northeast-2.amazoncognito.com
 auth.ap-northeast-3.amazoncognito.com
 auth.ap-south-1.amazoncognito.com
+auth.ap-south-2.amazoncognito.com
 auth.ap-southeast-1.amazoncognito.com
 auth.ap-southeast-2.amazoncognito.com
 auth.ap-southeast-3.amazoncognito.com
+auth.ap-southeast-4.amazoncognito.com
 auth.ca-central-1.amazoncognito.com
 auth.eu-central-1.amazoncognito.com
+auth.eu-central-2.amazoncognito.com
 auth.eu-north-1.amazoncognito.com
 auth.eu-south-1.amazoncognito.com
+auth.eu-south-2.amazoncognito.com
 auth.eu-west-1.amazoncognito.com
 auth.eu-west-2.amazoncognito.com
 auth.eu-west-3.amazoncognito.com
 auth.il-central-1.amazoncognito.com
+auth.me-central-1.amazoncognito.com
 auth.me-south-1.amazoncognito.com
 auth.sa-east-1.amazoncognito.com
 auth.us-east-1.amazoncognito.com
@@ -11399,7 +11394,7 @@ us-east-1.amazonaws.com
 
 // Amazon EMR
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 597f3f8e-9283-4e48-8e32-7ee25a1ff6ab
+// Reference: 82f43f9f-bbb8-400e-8349-854f5a62f20d
 emrappui-prod.cn-north-1.amazonaws.com.cn
 emrnotebooks-prod.cn-north-1.amazonaws.com.cn
 emrstudio-prod.cn-north-1.amazonaws.com.cn
@@ -11424,6 +11419,9 @@ emrstudio-prod.ap-northeast-3.amazonaws.com
 emrappui-prod.ap-south-1.amazonaws.com
 emrnotebooks-prod.ap-south-1.amazonaws.com
 emrstudio-prod.ap-south-1.amazonaws.com
+emrappui-prod.ap-south-2.amazonaws.com
+emrnotebooks-prod.ap-south-2.amazonaws.com
+emrstudio-prod.ap-south-2.amazonaws.com
 emrappui-prod.ap-southeast-1.amazonaws.com
 emrnotebooks-prod.ap-southeast-1.amazonaws.com
 emrstudio-prod.ap-southeast-1.amazonaws.com
@@ -11433,18 +11431,30 @@ emrstudio-prod.ap-southeast-2.amazonaws.com
 emrappui-prod.ap-southeast-3.amazonaws.com
 emrnotebooks-prod.ap-southeast-3.amazonaws.com
 emrstudio-prod.ap-southeast-3.amazonaws.com
+emrappui-prod.ap-southeast-4.amazonaws.com
+emrnotebooks-prod.ap-southeast-4.amazonaws.com
+emrstudio-prod.ap-southeast-4.amazonaws.com
 emrappui-prod.ca-central-1.amazonaws.com
 emrnotebooks-prod.ca-central-1.amazonaws.com
 emrstudio-prod.ca-central-1.amazonaws.com
+emrappui-prod.ca-west-1.amazonaws.com
+emrnotebooks-prod.ca-west-1.amazonaws.com
+emrstudio-prod.ca-west-1.amazonaws.com
 emrappui-prod.eu-central-1.amazonaws.com
 emrnotebooks-prod.eu-central-1.amazonaws.com
 emrstudio-prod.eu-central-1.amazonaws.com
+emrappui-prod.eu-central-2.amazonaws.com
+emrnotebooks-prod.eu-central-2.amazonaws.com
+emrstudio-prod.eu-central-2.amazonaws.com
 emrappui-prod.eu-north-1.amazonaws.com
 emrnotebooks-prod.eu-north-1.amazonaws.com
 emrstudio-prod.eu-north-1.amazonaws.com
 emrappui-prod.eu-south-1.amazonaws.com
 emrnotebooks-prod.eu-south-1.amazonaws.com
 emrstudio-prod.eu-south-1.amazonaws.com
+emrappui-prod.eu-south-2.amazonaws.com
+emrnotebooks-prod.eu-south-2.amazonaws.com
+emrstudio-prod.eu-south-2.amazonaws.com
 emrappui-prod.eu-west-1.amazonaws.com
 emrnotebooks-prod.eu-west-1.amazonaws.com
 emrstudio-prod.eu-west-1.amazonaws.com
@@ -11454,6 +11464,9 @@ emrstudio-prod.eu-west-2.amazonaws.com
 emrappui-prod.eu-west-3.amazonaws.com
 emrnotebooks-prod.eu-west-3.amazonaws.com
 emrstudio-prod.eu-west-3.amazonaws.com
+emrappui-prod.il-central-1.amazonaws.com
+emrnotebooks-prod.il-central-1.amazonaws.com
+emrstudio-prod.il-central-1.amazonaws.com
 emrappui-prod.me-central-1.amazonaws.com
 emrnotebooks-prod.me-central-1.amazonaws.com
 emrstudio-prod.me-central-1.amazonaws.com
@@ -11484,9 +11497,11 @@ emrstudio-prod.us-west-2.amazonaws.com
 
 // Amazon Managed Workflows for Apache Airflow
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 4ab55e6f-90c0-4a8d-b6a0-52ca5dbb1c2e
+// Reference: 87f24ece-a77e-40e8-bb4a-f6b74fe9f975
 *.cn-north-1.airflow.amazonaws.com.cn
 *.cn-northwest-1.airflow.amazonaws.com.cn
+*.af-south-1.airflow.amazonaws.com
+*.ap-east-1.airflow.amazonaws.com
 *.ap-northeast-1.airflow.amazonaws.com
 *.ap-northeast-2.airflow.amazonaws.com
 *.ap-south-1.airflow.amazonaws.com
@@ -11495,17 +11510,20 @@ emrstudio-prod.us-west-2.amazonaws.com
 *.ca-central-1.airflow.amazonaws.com
 *.eu-central-1.airflow.amazonaws.com
 *.eu-north-1.airflow.amazonaws.com
+*.eu-south-1.airflow.amazonaws.com
 *.eu-west-1.airflow.amazonaws.com
 *.eu-west-2.airflow.amazonaws.com
 *.eu-west-3.airflow.amazonaws.com
+*.me-south-1.airflow.amazonaws.com
 *.sa-east-1.airflow.amazonaws.com
 *.us-east-1.airflow.amazonaws.com
 *.us-east-2.airflow.amazonaws.com
+*.us-west-1.airflow.amazonaws.com
 *.us-west-2.airflow.amazonaws.com
 
 // Amazon S3
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 0e801048-08f2-4064-9cb8-e7373e0b57f4
+// Reference: cd5c8b3a-67b7-4b40-9236-c87ce81a3d10
 s3.dualstack.cn-north-1.amazonaws.com.cn
 s3-accesspoint.dualstack.cn-north-1.amazonaws.com.cn
 s3-website.dualstack.cn-north-1.amazonaws.com.cn
@@ -11604,6 +11622,16 @@ s3-accesspoint-fips.ca-central-1.amazonaws.com
 s3-fips.ca-central-1.amazonaws.com
 s3-object-lambda.ca-central-1.amazonaws.com
 s3-website.ca-central-1.amazonaws.com
+s3.dualstack.ca-west-1.amazonaws.com
+s3-accesspoint.dualstack.ca-west-1.amazonaws.com
+s3-accesspoint-fips.dualstack.ca-west-1.amazonaws.com
+s3-fips.dualstack.ca-west-1.amazonaws.com
+s3-website.dualstack.ca-west-1.amazonaws.com
+s3.ca-west-1.amazonaws.com
+s3-accesspoint.ca-west-1.amazonaws.com
+s3-accesspoint-fips.ca-west-1.amazonaws.com
+s3-fips.ca-west-1.amazonaws.com
+s3-website.ca-west-1.amazonaws.com
 s3.dualstack.eu-central-1.amazonaws.com
 s3-accesspoint.dualstack.eu-central-1.amazonaws.com
 s3-website.dualstack.eu-central-1.amazonaws.com
@@ -11784,9 +11812,25 @@ s3-fips.us-west-2.amazonaws.com
 s3-object-lambda.us-west-2.amazonaws.com
 s3-website.us-west-2.amazonaws.com
 
+// Amazon SageMaker Ground Truth
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 98dbfde4-7802-48c3-8751-b60f204e0d9c
+labeling.ap-northeast-1.sagemaker.aws
+labeling.ap-northeast-2.sagemaker.aws
+labeling.ap-south-1.sagemaker.aws
+labeling.ap-southeast-1.sagemaker.aws
+labeling.ap-southeast-2.sagemaker.aws
+labeling.ca-central-1.sagemaker.aws
+labeling.eu-central-1.sagemaker.aws
+labeling.eu-west-1.sagemaker.aws
+labeling.eu-west-2.sagemaker.aws
+labeling.us-east-1.sagemaker.aws
+labeling.us-east-2.sagemaker.aws
+labeling.us-west-2.sagemaker.aws
+
 // Amazon SageMaker Notebook Instances
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: fe8c9e94-5a22-486d-8750-991a3a9b13c6
+// Reference: b5ea56df-669e-43cc-9537-14aa172f5dfc
 notebook.af-south-1.sagemaker.aws
 notebook.ap-east-1.sagemaker.aws
 notebook.ap-northeast-1.sagemaker.aws
@@ -11799,6 +11843,9 @@ notebook.ap-southeast-2.sagemaker.aws
 notebook.ap-southeast-3.sagemaker.aws
 notebook.ap-southeast-4.sagemaker.aws
 notebook.ca-central-1.sagemaker.aws
+notebook-fips.ca-central-1.sagemaker.aws
+notebook.ca-west-1.sagemaker.aws
+notebook-fips.ca-west-1.sagemaker.aws
 notebook.eu-central-1.sagemaker.aws
 notebook.eu-central-2.sagemaker.aws
 notebook.eu-north-1.sagemaker.aws
@@ -11820,6 +11867,7 @@ notebook-fips.us-gov-east-1.sagemaker.aws
 notebook.us-gov-west-1.sagemaker.aws
 notebook-fips.us-gov-west-1.sagemaker.aws
 notebook.us-west-1.sagemaker.aws
+notebook-fips.us-west-1.sagemaker.aws
 notebook.us-west-2.sagemaker.aws
 notebook-fips.us-west-2.sagemaker.aws
 notebook.cn-north-1.sagemaker.com.cn
@@ -11827,7 +11875,7 @@ notebook.cn-northwest-1.sagemaker.com.cn
 
 // Amazon SageMaker Studio
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 057ee397-6bf8-4f20-b807-d7bc145ac980
+// Reference: 69c723d9-6e1a-4bff-a203-48eecd203183
 studio.af-south-1.sagemaker.aws
 studio.ap-east-1.sagemaker.aws
 studio.ap-northeast-1.sagemaker.aws
@@ -11841,6 +11889,7 @@ studio.ca-central-1.sagemaker.aws
 studio.eu-central-1.sagemaker.aws
 studio.eu-north-1.sagemaker.aws
 studio.eu-south-1.sagemaker.aws
+studio.eu-south-2.sagemaker.aws
 studio.eu-west-1.sagemaker.aws
 studio.eu-west-2.sagemaker.aws
 studio.eu-west-3.sagemaker.aws
@@ -11885,7 +11934,7 @@ analytics-gateway.us-west-2.amazonaws.com
 
 // AWS Cloud9
 // Submitted by: AWS Security <psl-maintainers@amazon.com>
-// Reference: 05c44955-977c-4b57-938a-f2af92733f9f
+// Reference: 30717f72-4007-4f0f-8ed4-864c6f2efec9
 webview-assets.aws-cloud9.af-south-1.amazonaws.com
 vfs.cloud9.af-south-1.amazonaws.com
 webview-assets.cloud9.af-south-1.amazonaws.com
@@ -11931,6 +11980,8 @@ webview-assets.cloud9.eu-west-2.amazonaws.com
 webview-assets.aws-cloud9.eu-west-3.amazonaws.com
 vfs.cloud9.eu-west-3.amazonaws.com
 webview-assets.cloud9.eu-west-3.amazonaws.com
+webview-assets.aws-cloud9.il-central-1.amazonaws.com
+vfs.cloud9.il-central-1.amazonaws.com
 webview-assets.aws-cloud9.me-south-1.amazonaws.com
 vfs.cloud9.me-south-1.amazonaws.com
 webview-assets.cloud9.me-south-1.amazonaws.com
@@ -11950,6 +12001,11 @@ webview-assets.aws-cloud9.us-west-2.amazonaws.com
 vfs.cloud9.us-west-2.amazonaws.com
 webview-assets.cloud9.us-west-2.amazonaws.com
 
+// AWS Directory Service
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: a13203e8-42dc-4045-a0d2-2ee67bed1068
+awsapps.com
+
 // AWS Elastic Beanstalk
 // Submitted by AWS Security <psl-maintainers@amazon.com>
 // Reference: bb5a965c-dec3-4967-aa22-e306ad064797
@@ -11993,6 +12049,11 @@ us-west-2.elasticbeanstalk.com
 // Reference: d916759d-a08b-4241-b536-4db887383a6a
 awsglobalaccelerator.com
 
+// AWS re:Post Private
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 83385945-225f-416e-9aa0-ad0632bfdcee
+*.private.repost.aws
+
 // eero
 // Submitted by Yue Kang <eero-dynamic-dns@amazon.com>
 // Reference: 264afe70-f62c-4c02-8ab9-b5281ed24461
@@ -12010,6 +12071,10 @@ tele.amune.org
 // Submitted by Apigee Security Team <security@apigee.com>
 apigee.io
 
+// Apis Networks: https://apisnetworks.com
+// Submitted by Matt Saladna <matt@apisnetworks.com>
+panel.dev
+
 // Apphud : https://apphud.com
 // Submitted by Alexander Selivanov <alex@apphud.com>
 siiites.com
@@ -12027,6 +12092,10 @@ appudo.net
 // Submitted by Thomas Orozco <thomas@aptible.com>
 on-aptible.com
 
+// Aquapal : https://aquapal.net/
+// Submitted by Aki Ueno <admin@aquapal.net>
+f5.si
+
 // ASEINet : https://www.aseinet.com/
 // Submitted by Asei SEKIGUCHI <mail@aseinet.com>
 user.aseinet.ne.jp
@@ -12062,6 +12131,7 @@ autocode.dev
 
 // AVM : https://avm.de
 // Submitted by Andreas Weise <a.weise@avm.de>
+myfritz.link
 myfritz.net
 
 // AVStack Pte. Ltd. : https://avstack.io
@@ -12121,10 +12191,18 @@ beagleboard.io
 // Submitted by Lev Nekrasov <lnekrasov@beget.com>
 *.beget.app
 
+// Besties : https://besties.house
+// Submitted by Hazel Cora <hazy@besties.house>
+pages.gay
+
 // BetaInABox
 // Submitted by Adrian <adrian@betainabox.com>
 betainabox.com
 
+// University of Bielsko-Biala regional domain: http://dns.bielsko.pl/
+// Submitted by Marcin <dns@ath.bielsko.pl>
+bielsko.pl
+
 // BinaryLane : http://www.binarylane.com
 // Submitted by Nathan O'Sullivan <nathan@mammoth.com.au>
 bnr.la
@@ -12166,8 +12244,13 @@ square7.de
 bplaced.net
 square7.net
 
+// Brave : https://brave.com
+// Submitted by Andrea Brancaleoni <abrancaleoni@brave.com>
+*.s.brave.io
+
 // Brendly : https://brendly.rs
-// Submitted by Dusan Radovanovic <dusan.radovanovic@brendly.rs>
+// Submitted by Dusan Radovanovic <administracija@brendly.rs>
+shop.brendly.hr
 shop.brendly.rs
 
 // BrowserSafetyMark
@@ -12191,7 +12274,9 @@ mycd.eu
 // Canva Pty Ltd : https://canva.com/
 // Submitted by Joel Aquilina <publicsuffixlist@canva.com>
 canva-apps.cn
+*.my.canvasite.cn
 canva-apps.com
+*.my.canva.site
 
 // Carrd : https://carrd.co
 // Submitted by AJ <aj@carrd.co>
@@ -12329,6 +12414,12 @@ pages.dev
 r2.dev
 workers.dev
 
+// cloudscale.ch AG : https://www.cloudscale.ch/
+// Submitted by Gaudenz Steinlin <support@cloudscale.ch>
+cust.cloudscale.ch
+objects.lpg.cloudscale.ch
+objects.rma.cloudscale.ch
+
 // Clovyr : https://clovyr.io
 // Submitted by Patrick Nielsen <patrick@clovyr.io>
 wnext.app
@@ -12346,22 +12437,33 @@ co.cz
 
 // CDN77.com : http://www.cdn77.com
 // Submitted by Jan Krpes <jan.krpes@cdn77.com>
-c.cdn77.org
+cdn77-storage.com
+rsc.contentproxy9.cz
 cdn77-ssl.net
 r.cdn77.net
-rsc.cdn77.org
 ssl.origin.cdn77-secure.org
+c.cdn77.org
+rsc.cdn77.org
 
 // Cloud DNS Ltd : http://www.cloudns.net
-// Submitted by Aleksander Hristov <noc@cloudns.net>
+// Submitted by Aleksander Hristov <noc@cloudns.net> & Boyan Peychev <boyan@cloudns.net>
 cloudns.asia
+cloudns.be
 cloudns.biz
-cloudns.club
 cloudns.cc
+cloudns.ch
+cloudns.cl
+cloudns.club
+dnsabr.com
+cloudns.cx
 cloudns.eu
 cloudns.in
 cloudns.info
+dns-cloud.net
+dns-dynamic.net
+cloudns.nz
 cloudns.org
+cloudns.ph
 cloudns.pro
 cloudns.pw
 cloudns.us
@@ -12374,6 +12476,11 @@ cnpy.gdn
 // Submitted by Moritz Marquardt <git@momar.de>
 codeberg.page
 
+// CodeSandbox B.V. : https://codesandbox.io
+// Submitted by Ives van Hoorne <abuse@codesandbox.io>
+csb.app
+preview.csb.app
+
 // CoDNS B.V.
 co.nl
 co.no
@@ -12383,6 +12490,10 @@ co.no
 webhosting.be
 hosting-cluster.nl
 
+// Convex : https://convex.dev/
+// Submitted by James Cowling <security@convex.dev>
+convex.site
+
 // Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/
 // Submitted by George Georgievsky <gug@cctld.ru>
 ac.ru
@@ -12404,10 +12515,18 @@ feste-ip.net
 knx-server.net
 static-access.net
 
+// cPanel L.L.C. : https://www.cpanel.net/
+// Submitted by Dustin Scherer <public.suffix@cpanel.net>
+*.cprapid.com
+
 // Craynic, s.r.o. : http://www.craynic.com/
 // Submitted by Ales Krajnik <ales.krajnik@craynic.com>
 realm.cz
 
+// Crisp IM SAS : https://crisp.chat/
+// Submitted by Baptiste Jamin <hostmaster@crisp.chat>
+on.crisp.email
+
 // Cryptonomic : https://cryptonomic.net/
 // Submitted by Andrew Cady <public-suffix-list@cryptonomic.net>
 *.cryptonomic.net
@@ -12428,6 +12547,13 @@ curv.dev
 *.ocp.customer-oci.com
 *.ocs.customer-oci.com
 
+// Cyclic Software : https://www.cyclic.sh
+// Submitted by Kam Lasater <dns-admin@cyclic.sh>
+cyclic.app
+cyclic.cloud
+cyclic-app.com
+cyclic.co.in
+
 // cyon GmbH : https://www.cyon.ch/
 // Submitted by Dominic Luechinger <dol@cyon.ch>
 cyon.link
@@ -12473,6 +12599,7 @@ dyndns.dappnode.io
 // Dark, Inc. : https://darklang.com
 // Submitted by Paul Biggar <ops@darklang.com>
 builtwithdark.com
+darklang.io
 
 // DataDetect, LLC. : https://datadetect.com
 // Submitted by Andrew Banchich <abanchich@sceven.com>
@@ -12871,6 +12998,10 @@ ondigitalocean.app
 // Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
 *.digitaloceanspaces.com
 
+// DigitalPlat : https://www.digitalplat.org/
+// Submitted by Edward Hsing <contact@digitalplat.org>
+us.kg
+
 // dnstrace.pro : https://dnstrace.pro/
 // Submitted by Chris Partridge <chris@partridge.tech>
 bci.dnstrace.pro
@@ -12908,6 +13039,18 @@ e4.cz
 easypanel.app
 easypanel.host
 
+// EasyWP : https://www.easywp.com
+// Submitted by <infracloudteam@namecheap.com>
+*.ewp.live
+
+// Electromagnetic Field : https://www.emfcamp.org
+// Submitted by <noc@emfcamp.org>
+at.emf.camp
+
+// Elefunc, Inc. : https://elefunc.com
+// Submitted by Cetin Sert <domains@elefunc.com>
+rt.ht
+
 // Elementor : Elementor Ltd.
 // Submitted by Anton Barkan <antonb@elementor.com>
 elementor.cloud
@@ -13022,10 +13165,6 @@ url.tw
 // Submitted by Eric Jiang <eric@fabrica.dev>
 onfabrica.com
 
-// Facebook, Inc.
-// Submitted by Peter Ruibal <public-suffix@fb.com>
-apps.fbsbx.com
-
 // FAITID : https://faitid.org/
 // Submitted by Maxim Alzoba <tech.contact@faitid.org>
 // https://www.flexireg.net/stat_info
@@ -13183,6 +13322,10 @@ flap.id
 onflashdrive.app
 fldrv.com
 
+// FlutterFlow : https://flutterflow.io
+// Submitted by Anton Emelyanov <anton@flutterflow.io>
+flutterflow.app
+
 // fly.io: https://fly.io
 // Submitted by Kurt Mackey <kurt@fly.io>
 fly.dev
@@ -13193,13 +13336,14 @@ shw.io
 // Submitted by Jonathan Rudenberg <jonathan@flynn.io>
 flynnhosting.net
 
-// Forgerock : https://www.forgerock.com
+// Forgerock : https://www.forgerock.com
 // Submitted by Roderick Parr <roderick.parr@forgerock.com>
 forgeblocks.com
 id.forgerock.io
 
 // Framer : https://www.framer.com
-// Submitted by Koen Rouwhorst <koenrh@framer.com>
+// Submitted by Koen Rouwhorst <security@framer.com>
+framer.ai
 framer.app
 framercanvas.com
 framer.media
@@ -13240,6 +13384,24 @@ freemyip.com
 // Submitted by Daniel A. Maierhofer <vorstand@funkfeuer.at>
 wien.funkfeuer.at
 
+// Future Versatile Group. ：https://www.fvg-on.net/
+// T.Kabu <webmaster@fvg-on.net>
+daemon.asia
+dix.asia
+mydns.bz
+0am.jp
+0g0.jp
+0j0.jp
+0t0.jp
+mydns.jp
+pgw.jp
+wjg.jp
+keyword-on.net
+live-on.net
+server-on.net
+mydns.tw
+mydns.vc
+
 // Futureweb GmbH : https://www.futureweb.at
 // Submitted by Andreas Schnederle-Wagner <schnederle@futureweb.at>
 *.futurecms.at
@@ -13251,6 +13413,10 @@ futuremailing.at
 *.kunden.ortsinfo.at
 *.statics.cloud
 
+// GCom Internet : https://www.gcom.net.au
+// Submitted by Leo Julius <support@gcom.net.au>
+aliases121.com
+
 // GDS : https://www.gov.uk/service-manual/technology/managing-domain-names
 // Submitted by Stephen Ford <hostmaster@digital.cabinet-office.gov.uk>
 independent-commission.uk
@@ -13279,9 +13445,11 @@ gentlentapis.com
 lab.ms
 cdn-edges.net
 
-// Ghost Foundation : https://ghost.org
-// Submitted by Matt Hanley <security@ghost.org>
-ghost.io
+// Getlocalcert: https://www.getlocalcert.net
+// Submitted by Robert Alexander <support@getlocalcert.net>
+localcert.net
+localhostcert.net
+corpnet.work
 
 // GignoSystemJapan: http://gsj.bz
 // Submitted by GignoSystemJapan <kakutou-ec@gsj.bz>
@@ -13425,6 +13593,10 @@ whitesnow.jp
 zombie.jp
 heteml.net
 
+// GoDaddy Registry : https://registry.godaddy
+// Submitted by Rohan Durrant <tldns@registry.godaddy>
+graphic.design
+
 // GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
 // Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
 cloudapps.digital
@@ -13434,10 +13606,6 @@ london.cloudapps.digital
 // Submitted by Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
 pymnt.uk
 
-// UKHomeOffice : https://www.gov.uk/government/organisations/home-office
-// Submitted by Jon Shanks <jon.shanks@digital.homeoffice.gov.uk>
-homeoffice.gov.uk
-
 // GlobeHosting, Inc.
 // Submitted by Zoltan Egresi <egresi@globehosting.com>
 ro.im
@@ -13448,8 +13616,7 @@ goip.de
 
 // Google, Inc.
 // Submitted by Eduardo Vela <evn@google.com>
-run.app
-a.run.app
+*.run.app
 web.app
 *.0emm.com
 appspot.com
@@ -13549,6 +13716,10 @@ goupile.fr
 // Submitted by <domeinnaam@minaz.nl>
 gov.nl
 
+// GrayJay Web Solutions Inc. : https://grayjaysports.ca
+// Submitted by Matt Yamkowy <info@grayjaysports.ca>
+grayjayleagues.com
+
 // Group 53, LLC : https://www.group53.com
 // Submitted by Tyler Todd <noc@nova53.net>
 awsmppl.com
@@ -13583,6 +13754,11 @@ hasura-app.io
 // Submitted by Richard Zowalla <mi-admin@hs-heilbronn.de>
 pages.it.hs-heilbronn.de
 
+// Helio Networks : https://heliohost.org
+// Submitted by Ben Frede <admin@heliohost.org>
+helioho.st
+heliohost.us
+
 // Hepforge : https://www.hepforge.org
 // Submitted by David Grellscheid <admin@hepforge.org>
 hepforge.org
@@ -13596,7 +13772,6 @@ herokussl.com
 // Submitted by Oren Eini <oren@ravendb.net>
 ravendb.cloud
 ravendb.community
-ravendb.me
 development.run
 ravendb.run
 
@@ -13604,6 +13779,12 @@ ravendb.run
 // Submitted by Krzysztof Wolski <krzysztof.wolski@home.eu>
 homesklep.pl
 
+// Homebase : https://homebase.id/
+// Submitted by Jason Babo <info@homebase.id>
+*.kin.one
+*.id.pub
+*.kin.pub
+
 // Hong Kong Productivity Council: https://www.hkpc.org/
 // Submitted by SECaaS Team <summchan@hkpc.org>
 secaas.hk
@@ -13681,7 +13862,7 @@ biz.at
 info.at
 
 // info.cx : http://info.cx
-// Submitted by Jacob Slater <whois@igloo.to>
+// Submitted by June Slater <whois@igloo.to>
 info.cx
 
 // Interlegis : http://www.interlegis.leg.br
@@ -13730,6 +13911,14 @@ iopsys.se
 // Submitted by Matthew Hardeman <mhardeman@ipifony.com>
 ipifony.net
 
+// is-a.dev : https://www.is-a.dev
+// Submitted by William Harrison <admin@maintainers.is-a.dev>
+is-a.dev
+
+// ir.md : https://nic.ir.md
+// Submitted by Ali Soizi <info@nic.ir.md>
+ir.md
+
 // IServ GmbH : https://iserv.de
 // Submitted by Mario Hoberg <info@iserv.de>
 iservschule.de
@@ -13838,6 +14027,11 @@ myjino.ru
 // Submitted by Daniel Fariña <ingenieria@jotelulu.com>
 jotelulu.cloud
 
+// JouwWeb B.V. : https://www.jouwweb.nl
+// Submitted by Camilo Sperberg <tech@webador.com>
+jouwweb.site
+webadorsite.com
+
 // Joyent : https://www.joyent.com/
 // Submitted by Brian Bennett <brian.bennett@joyent.com>
 *.triton.zone
@@ -13911,6 +14105,10 @@ lpusercontent.com
 // Submitted by Lelux Admin <publisuffix@lelux.site>
 lelux.site
 
+// Libre IT Ltd : https://libre.nz
+// Submitted by Tomas Maggio <support@libre.nz>
+runcontainers.dev
+
 // Lifetime Hosting : https://Lifetime.Hosting/
 // Submitted by Mike Fillator <support@lifetime.hosting>
 co.business
@@ -13921,10 +14119,6 @@ co.network
 co.place
 co.technology
 
-// Lightmaker Property Manager, Inc. : https://app.lmpm.com/
-// Submitted by Greg Holland <greg.holland@lmpm.com>
-app.lmpm.com
-
 // linkyard ldt: https://www.linkyard.ch/
 // Submitted by Mario Siegenthaler <mario.siegenthaler@linkyard.ch>
 linkyard.cloud
@@ -14057,6 +14251,11 @@ memset.net
 // Submitted by Ruben Schmidmeister <psl-maintainers@messerli.ch>
 messerli.app
 
+// Meta Platforms, Inc. : https://meta.com/
+// Submitted by Jacob Cordero <public-suffix@meta.com>
+atmeta.com
+apps.fbsbx.com
+
 // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
 // Submitted by Zdeněk Šustr <zdenek.sustr@cesnet.cz>
 *.cloud.metacentrum.cz
@@ -14077,10 +14276,14 @@ co.pl
 
 // Microsoft Corporation : http://microsoft.com
 // Submitted by Public Suffix List Admin <msftpsladmin@microsoft.com>
+// Managed by Corporate Domains
+// Microsoft Azure : https://home.azure
 *.azurecontainer.io
+azure-api.net
+azureedge.net
+azurefd.net
 azurewebsites.net
 azure-mobile.net
-cloudapp.net
 azurestaticapps.net
 1.azurestaticapps.net
 2.azurestaticapps.net
@@ -14094,6 +14297,10 @@ eastasia.azurestaticapps.net
 eastus2.azurestaticapps.net
 westeurope.azurestaticapps.net
 westus2.azurestaticapps.net
+cloudapp.net
+trafficmanager.net
+blob.core.windows.net
+servicebus.windows.net
 
 // minion.systems : http://minion.systems
 // Submitted by Robert Böttinger <r@minion.systems>
@@ -14107,6 +14314,10 @@ mintere.site
 // Submitted by Grayson Martin <grayson.martin@mobileeducation.us>
 forte.id
 
+// MODX Systems LLC : https://modx.com
+// Submitted by Elizabeth Southwell <elizabeth@modx.com>
+modx.dev
+
 // Mozilla Corporation : https://mozilla.com
 // Submitted by Ben Francis <bfrancis@mozilla.com>
 mozilla-iot.org
@@ -14153,6 +14364,10 @@ netlify.app
 // Submitted by Trung Tran <Trung.Tran@neustar.biz>
 4u.com
 
+// NGO.US Registry : https://nic.ngo.us
+// Submitted by Alstra Solutions Ltd. Networking Team <admin@alstra.org>
+ngo.us
+
 // ngrok : https://ngrok.com/
 // Submitted by Alan Shreve <alan@ngrok.com>
 ngrok.app
@@ -14168,18 +14383,24 @@ jp.ngrok.io
 sa.ngrok.io
 us.ngrok.io
 ngrok.pizza
+ngrok.pro
 
 // Nicolaus Copernicus University in Torun - MSK TORMAN (https://www.man.torun.pl)
 torun.pl
 
 // Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/
-// Submitted by Nicholas Ford <nick@nimbushosting.co.uk>
+// Submitted by Nicholas Ford <dev@nimbushosting.co.uk>
 nh-serv.co.uk
+nimsite.uk
 
 // NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
 // Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
 nfshost.com
 
+// NFT.Storage : https://nft.storage/
+// Submitted by Vasco Santos <vasco.santos@protocol.ai> or <support@nft.storage>
+ipfs.nftstorage.link
+
 // Noop : https://noop.app
 // Submitted by Nathaniel Schweinberg <noop@rearc.io>
 *.developer.app
@@ -14330,6 +14551,10 @@ pcloud.host
 // Submitted by Matthew Brown <mattbrown@nyc.mn>
 nyc.mn
 
+// O3O.Foundation : https://o3o.foundation/
+// Submitted by the prvcy.page Registry Team <psl@registry.prvcy.page>
+prvcy.page
+
 // Observable, Inc. : https://observablehq.com
 // Submitted by Mike Bostock <dns@observablehq.com>
 static.observableusercontent.com
@@ -14359,7 +14584,6 @@ omniwe.site
 123minsida.se
 123miweb.es
 123paginaweb.pt
-123sait.ru
 123siteweb.fr
 123webseite.at
 123webseite.de
@@ -14377,6 +14601,13 @@ simplesite.pl
 // Submitted by Eddie Jones <eddie@onefoldmedia.com>
 nid.io
 
+// Open Domains : https://open-domains.net
+// Submitted by William Harrison <admin@open-domains.net>
+is-cool.dev
+is-not-a.dev
+localplayer.dev
+is-local.org
+
 // Open Social : https://www.getopensocial.com/
 // Submitted by Alexander Varwijk <security@getopensocial.com>
 opensocial.site
@@ -14397,6 +14628,11 @@ operaunite.com
 // Submitted by Alexandre Linte <alexandre.linte@orange.com>
 tech.orange
 
+// OsSav Technology Ltd. : https://ossav.com/
+// TLD Nic: http://nic.can.re - TLD Whois Server: whois.can.re
+// Submitted by OsSav Technology Ltd. <support@ossav.com>
+can.re
+
 // Oursky Limited : https://authgear.com/, https://skygear.io/
 // Submitted by Authgear Team <hello@authgear.com>, Skygear Developer <hello@skygear.io>
 authgear-staging.com
@@ -14447,10 +14683,11 @@ pagexl.com
 
 // pcarrier.ca Software Inc: https://pcarrier.ca/
 // Submitted by Pierre Carrier <pc@rrier.ca>
-bar0.net
-bar1.net
-bar2.net
-rdv.to
+*.xmit.co
+xmit.dev
+srv.us
+gh.srv.us
+gl.srv.us
 
 // .pl domains (grandfathered)
 art.pl
@@ -14483,7 +14720,8 @@ on-web.fr
 
 // Platform.sh : https://platform.sh
 // Submitted by Nikola Kotur <nikola@platform.sh>
-bc.platform.sh
+*.upsun.app
+upsunapp.com
 ent.platform.sh
 eu.platform.sh
 us.platform.sh
@@ -14502,6 +14740,10 @@ pdns.page
 plesk.page
 pleskns.com
 
+// Pley AB : https://www.pley.com/
+// Submitted by Henning Pohl <infra@pley.com>
+pley.games
+
 // Port53 : https://port53.io/
 // Submitted by Maximilian Schieder <maxi@zeug.co>
 dyn53.io
@@ -14533,10 +14775,6 @@ xen.prgmr.com
 // Submitted by registry <lendl@nic.at>
 priv.at
 
-// privacytools.io : https://www.privacytools.io/
-// Submitted by Jonah Aragon <jonah@privacytools.io>
-prvcy.page
-
 // Protocol Labs : https://protocol.ai/
 // Submitted by Michael Burns <noc@protocol.ai>
 *.dweb.link
@@ -14578,6 +14816,8 @@ qbuser.com
 // Rad Web Hosting: https://radwebhosting.com
 // Submitted by Scott Claeys <s.claeys@radwebhosting.com>
 cloudsite.builders
+myradweb.net
+servername.us
 
 // Redgate Software: https://red-gate.com
 // Submitted by Andrew Farries <andrew.farries@red-gate.com>
@@ -14601,9 +14841,12 @@ qcx.io
 *.sys.qcx.io
 
 // QNAP System Inc : https://www.qnap.com
-// Submitted by Nick Chang <nickchang@qnap.com>
-dev-myqnapcloud.com
+// Submitted by Nick Chang <cloudadmin@qnap.com>
+myqnapcloud.cn
 alpha-myqnapcloud.com
+dev-myqnapcloud.com
+mycloudnas.com
+mynascloud.com
 myqnapcloud.com
 
 // Quip : https://quip.com
@@ -14644,11 +14887,40 @@ app.render.com
 onrender.com
 
 // Repl.it : https://repl.it
-// Submitted by Lincoln Bergeson <lincoln@replit.com>
+// Submitted by Lincoln Bergeson <psl@repl.it>
+replit.app
+id.replit.app
 firewalledreplit.co
 id.firewalledreplit.co
 repl.co
 id.repl.co
+replit.dev
+archer.replit.dev
+bones.replit.dev
+canary.replit.dev
+global.replit.dev
+hacker.replit.dev
+id.replit.dev
+janeway.replit.dev
+kim.replit.dev
+kira.replit.dev
+kirk.replit.dev
+odo.replit.dev
+paris.replit.dev
+picard.replit.dev
+pike.replit.dev
+prerelease.replit.dev
+reed.replit.dev
+riker.replit.dev
+sisko.replit.dev
+spock.replit.dev
+staging.replit.dev
+sulu.replit.dev
+tarpit.replit.dev
+teams.replit.dev
+tucker.replit.dev
+wesley.replit.dev
+worf.replit.dev
 repl.run
 
 // Resin.io : https://resin.io
@@ -14745,10 +15017,11 @@ from.tv
 sakura.tv
 
 // Salesforce.com, Inc. https://salesforce.com/
-// Submitted by Michael Biven <mbiven@salesforce.com>
+// Submitted by Michael Biven <mbiven@salesforce.com> and Aaron Romeo <aaron.romeo@salesforce.com>
 *.builder.code.com
 *.dev-builder.code.com
 *.stg-builder.code.com
+*.001.test.code-builder-stg.platform.salesforce.com
 
 // Sandstorm Development Group, Inc. : https://sandcats.io/
 // Submitted by Asheesh Laroia <asheesh@sandstorm.io>
@@ -14764,6 +15037,7 @@ logoip.com
 fr-par-1.baremetal.scw.cloud
 fr-par-2.baremetal.scw.cloud
 nl-ams-1.baremetal.scw.cloud
+cockpit.fr-par.scw.cloud
 fnc.fr-par.scw.cloud
 functions.fnc.fr-par.scw.cloud
 k8s.fr-par.scw.cloud
@@ -14774,11 +15048,13 @@ whm.fr-par.scw.cloud
 priv.instances.scw.cloud
 pub.instances.scw.cloud
 k8s.scw.cloud
+cockpit.nl-ams.scw.cloud
 k8s.nl-ams.scw.cloud
 nodes.k8s.nl-ams.scw.cloud
 s3.nl-ams.scw.cloud
 s3-website.nl-ams.scw.cloud
 whm.nl-ams.scw.cloud
+cockpit.pl-waw.scw.cloud
 k8s.pl-waw.scw.cloud
 nodes.k8s.pl-waw.scw.cloud
 s3.pl-waw.scw.cloud
@@ -14800,6 +15076,10 @@ service.gov.scot
 // Submitted by Shante Adam <shante@skyhat.io>
 scrysec.com
 
+// Scrypted : https://scrypted.app
+// Submitted by Koushik Dutta <public-suffix-list@scrypted.app>
+client.scrypted.io
+
 // Securepoint GmbH : https://www.securepoint.de
 // Submitted by Erik Anders <erik.anders@securepoint.de>
 firewall-gateway.com
@@ -14839,6 +15119,10 @@ biz.ua
 co.ua
 pp.ua
 
+// Sheezy.Art : https://sheezy.art
+// Submitted by Nyoom <admin@sheezy.art>
+sheezy.games
+
 // Shift Crypto AG : https://shiftcrypto.ch
 // Submitted by alex <alex@shiftcrypto.ch>
 shiftcrypto.dev
@@ -14887,7 +15171,7 @@ alpha.bounty-full.com
 beta.bounty-full.com
 
 // Smallregistry by Promopixel SARL: https://www.smallregistry.net
-// Former AFNIC's SLDs 
+// Former AFNIC's SLDs
 // Submitted by Jérôme Lipowicz <support@promopixel.com>
 aeroport.fr
 avocat.fr
@@ -14909,9 +15193,9 @@ small-web.org
 vp4.me
 
 // Snowflake Inc : https://www.snowflake.com/
-// Submitted by Faith Olapade <faith.olapade@snowflake.com>
-snowflake.app
-privatelink.snowflake.app
+// Submitted by Sam Haar <psl@snowflake.com>
+*.snowflake.app
+*.privatelink.snowflake.app
 streamlit.app
 streamlitapp.com
 
@@ -14923,10 +15207,24 @@ try-snowplow.com
 // Submitted by Drew DeVault <sir@cmpwn.com>
 srht.site
 
+// StackBlitz : https://stackblitz.com
+// Submitted by Dominic Elm <hello@stackblitz.com>
+w-corp-staticblitz.com
+w-credentialless-staticblitz.com
+w-staticblitz.com
+
 // Stackhero : https://www.stackhero.io
 // Submitted by Adrien Gillon <adrien+public-suffix-list@stackhero.io>
 stackhero-network.com
 
+// STACKIT : https://www.stackit.de/en/
+// Submitted by STACKIT-DNS Team (Simon Stier) <stackit-dns@mail.schwarz>
+runs.onstackit.cloud
+stackit.gg
+stackit.rocks
+stackit.run
+stackit.zone
+
 // Staclar : https://staclar.com
 // Submitted by Q Misell <q@staclar.com>
 musician.io
@@ -14993,6 +15291,19 @@ myspreadshop.co.uk
 // Submitted by Jacob Lee <jacob@stdlib.com>
 api.stdlib.com
 
+// stereosense GmbH : https://www.involve.me
+// Submitted by Florian Burmann <publicsuffix@involve.me>
+feedback.ac
+forms.ac
+assessments.cx
+calculators.cx
+funnels.cx
+paynow.cx
+quizzes.cx
+researched.cx
+tests.cx
+surveys.so
+
 // Storipress : https://storipress.com
 // Submitted by Benno Liu <benno@storipress.com>
 storipress.app
@@ -15001,6 +15312,12 @@ storipress.app
 // Submitted by Philip Hutchins <hostmaster@storj.io>
 storj.farm
 
+// Streak : https://streak.com
+// Submitted by Blake Kadatz <eng@streak.com>
+streak-link.com
+streaklinks.com
+streakusercontent.com
+
 // Studenten Net Twente : http://www.snt.utwente.nl/
 // Submitted by Silke Hofstra <syscom@snt.utwente.nl>
 utwente.io
@@ -15063,6 +15380,7 @@ taifun-dns.de
 // Submitted by David Anderson <danderson@tailscale.com>
 beta.tailscale.net
 ts.net
+*.c.ts.net
 
 // TASK geographical domains (www.task.gda.pl/uslugi/dns)
 gda.pl
@@ -15196,6 +15514,10 @@ inc.hk
 // Submitted by ITComdomains <to@it.com>
 it.com
 
+// Unison Computing, PBC : https://unison.cloud
+// Submitted by Simon Højberg <security@unison.cloud>
+unison-services.cloud
+
 // UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/
 // see also: whois -h whois.udr.org.yt help
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@udr.org.yt>
@@ -15245,48 +15567,6 @@ v-info.info
 // Submitted by Nathan van Bakel <info@voorloper.com>
 voorloper.cloud
 
-// Voxel.sh DNS : https://voxel.sh/dns/
-// Submitted by Mia Rehlinger <dns@voxel.sh>
-neko.am
-nyaa.am
-be.ax
-cat.ax
-es.ax
-eu.ax
-gg.ax
-mc.ax
-us.ax
-xy.ax
-nl.ci
-xx.gl
-app.gp
-blog.gt
-de.gt
-to.gt
-be.gy
-cc.hn
-blog.kg
-io.kg
-jp.kg
-tv.kg
-uk.kg
-us.kg
-de.ls
-at.md
-de.md
-jp.md
-to.md
-indie.porn
-vxl.sh
-ch.tc
-me.tc
-we.tc
-nyan.to
-at.vg
-blog.vu
-dev.vu
-me.vu
-
 // V.UA Domain Administrator : https://domain.v.ua/
 // Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
 v.ua
@@ -15299,6 +15579,11 @@ v.ua
 // Submitted by Masayuki Note <masa@blade.wafflecell.com>
 wafflecell.com
 
+// Webflow, Inc. : https://www.webflow.com
+// Submitted by Webflow Security Team <security@webflow.com>
+webflow.io
+webflowtest.io
+
 // WebHare bv: https://www.webhare.com/
 // Submitted by Arnold Hendriks <info@webhare.com>
 *.webhare.dev
@@ -15310,6 +15595,10 @@ reserve-online.com
 bookonline.app
 hotelwithflight.com
 
+// WebWaddle Ltd: https://webwaddle.com/
+// Submitted by Merlin Glander <hostmaster@webwaddle.com>
+*.wadl.top
+
 // WeDeploy by Liferay, Inc. : https://www.wedeploy.com
 // Submitted by Henrique Vicente <security@wedeploy.com>
 wedeploy.io
@@ -15418,6 +15707,10 @@ noho.st
 za.net
 za.org
 
+// ZAP-Hosting GmbH & Co. KG : https://zap-hosting.com
+// Submitted by Julian Alker <security@zap-hosting.com>
+zap.cloud
+
 // Zine EOOD : https://zine.bg/
 // Submitted by Martin Angelov <martin@zine.bg>
 bss.design
diff --git a/src/java.base/share/legal/public_suffix.md b/src/java.base/share/legal/public_suffix.md
index 493f3b1680dfb..02481558af654 100644
--- a/src/java.base/share/legal/public_suffix.md
+++ b/src/java.base/share/legal/public_suffix.md
@@ -11,7 +11,7 @@ If you do not wish to use the Public Suffix List, you may remove the
 
 The Source Code of this file is available under the
 Mozilla Public License, v. 2.0 and is located at
-https://raw.githubusercontent.com/publicsuffix/list/b5bf572c52988dbe9d865b8f090ea819024a9936/public_suffix_list.dat.
+https://raw.githubusercontent.com/publicsuffix/list/1cbd6e71a9b83620b1d0b11e49d3d9ff48c27e22/public_suffix_list.dat.
 If a copy of the MPL was not distributed with this file, you can obtain one
 at https://mozilla.org/MPL/2.0/.
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
index 72b8c759e30b5..65f29ea8384fe 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -348,6 +348,8 @@ protected void initComponentDefaults(UIDefaults table) {
         Double defaultCaretAspectRatio = Double.valueOf(0.025);
         Color caretColor = table.getColor("caretColor");
         Color controlText = table.getColor("controlText");
+        Color tabbedPaneBg = new ColorUIResource(238, 238, 238);
+        Color unselectedTabColor = new ColorUIResource(255, 255, 255);
 
         Object fieldInputMap = new UIDefaults.LazyInputMap(new Object[] {
                        "ctrl C", DefaultEditorKit.copyAction,
@@ -1020,6 +1022,11 @@ public Object createValue(UIDefaults table) {
             "TabbedPane.selectedLabelShift", 3,
             "TabbedPane.font", new FontLazyValue(Region.TABBED_PANE),
             "TabbedPane.selectedTabPadInsets", new InsetsUIResource(2, 2, 0, 1),
+            "TabbedPane.selected", tabbedPaneBg,
+            "TabbedPane.contentOpaque", Boolean.TRUE,
+            "TabbedPane.tabsOpaque", Boolean.TRUE,
+            "TabbedPane.contentAreaColor", tabbedPaneBg,
+            "TabbedPane.unselectedBackground", unselectedTabColor,
 
             "Table.scrollPaneBorder", zeroBorder,
             "Table.background", tableBg,
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
index 1635ff66f89c1..e643d3d28ff3d 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -972,6 +972,9 @@ public void paintTabbedPaneTabBackground(SynthContext context,
         JTabbedPane pane = (JTabbedPane)context.getComponent();
         int placement = pane.getTabPlacement();
 
+        // Fill the tab rect area
+        g.fillRect(x, y, w, h);
+
         synchronized (UNIXToolkit.GTK_LOCK) {
             if (! ENGINE.paintCachedImage(g, x, y, w, h,
                     id, gtkState, placement, tabIndex)) {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
index 38e8530983aad..1d486f9fe0644 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 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
@@ -83,6 +83,9 @@
       <uiColor name="nimbusDisabledText">
          <matte red="142" green="143" blue="145" alpha="255" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
       </uiColor>
+      <uiColor name="nimbusTabbedPaneContentArea">
+         <matte red="238" green="238" blue="238" alpha="255" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+      </uiColor>
       <uiColor name="nimbusLightBackground">
          <matte red="255" green="255" blue="255" alpha="255" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
       </uiColor>
@@ -21646,6 +21649,11 @@
                <uiProperty name="tabOverlap" type="INT" value="-1"/>
                <uiProperty name="extendTabsToBase" type="BOOLEAN" value="true"/>
                <uiProperty name="useBasicArrows" type="BOOLEAN" value="true"/>
+               <uiProperty name="contentOpaque" type="BOOLEAN" value="true"/>
+               <uiProperty name="tabsOpaque" type="BOOLEAN" value="true"/>
+               <uiProperty name="contentAreaColor" type="COLOR">
+                  <matte red="238" green="238" blue="238" alpha="255" uiDefaultParentName="nimbusTabbedPaneContentArea" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+               </uiProperty>
                <uiProperty name="shadow" type="COLOR">
                   <matte red="142" green="143" blue="145" alpha="255" uiDefaultParentName="nimbusDisabledText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
                </uiProperty>
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
index e6b00871b100c..837c4d8298f9e 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -26,6 +26,7 @@
 package javax.swing.plaf.synth;
 
 import java.awt.Component;
+import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
@@ -121,6 +122,13 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
 
     private boolean selectedTabIsPressed = false;
 
+    // Background color for selected tab and content pane
+    private Color selectColor;
+    // Background color for unselected tabs
+    private Color unselectedBackground;
+    private boolean contentOpaque = true;
+    private boolean tabsOpaque = true;
+
     /**
      *
      * Constructs a {@code SynthTabbedPaneUI}.
@@ -146,6 +154,10 @@ private boolean scrollableTabLayoutEnabled() {
      */
     @Override
     protected void installDefaults() {
+        selectColor = UIManager.getColor("TabbedPane.selected");
+        contentOpaque = UIManager.getBoolean("TabbedPane.contentOpaque");
+        tabsOpaque = UIManager.getBoolean("TabbedPane.tabsOpaque");
+        unselectedBackground = UIManager.getColor("TabbedPane.unselectedBackground");
         updateStyle(tabPane);
     }
 
@@ -636,8 +648,17 @@ private void paintTab(SynthContext ss, Graphics g,
                 }
             }
         }
-        tabContext.getPainter().paintTabbedPaneTabBackground(tabContext, g,
-                x, y, width, height, tabIndex, placement);
+
+        if (isSelected) {
+            g.setColor(selectColor);
+        } else {
+            g.setColor(getUnselectedBackgroundAt(tabIndex));
+        }
+
+        if (tabsOpaque || tabPane.isOpaque()) {
+            tabContext.getPainter().paintTabbedPaneTabBackground(tabContext, g,
+                    x, y, width, height, tabIndex, placement);
+        }
         tabContext.getPainter().paintTabbedPaneTabBorder(tabContext, g,
                 x, y, width, height, tabIndex, placement);
 
@@ -655,9 +676,15 @@ private void paintTab(SynthContext ss, Graphics g,
             paintIcon(g, tabPlacement, tabIndex, icon, iconRect, isSelected);
             paintText(ss, g, tabPlacement, font, metrics,
                     tabIndex, clippedTitle, textRect, isSelected);
+        }
+    }
 
-
+    private Color getUnselectedBackgroundAt(int index) {
+        Color color = tabPane.getBackgroundAt(index);
+        if (color instanceof UIResource && unselectedBackground != null) {
+            return unselectedBackground;
         }
+        return color;
     }
 
     private void layoutLabel(SynthContext ss, int tabPlacement,
@@ -737,6 +764,21 @@ private void paintContentBorder(SynthContext ss, Graphics g,
               h -= (y - insets.top);
         }
         SynthLookAndFeel.updateSubregion(ss, g, new Rectangle(x, y, w, h));
+
+        if (tabPane.getTabCount() > 0 && (contentOpaque || tabPane.isOpaque())) {
+            // Fill region behind content area
+            Color color = UIManager.getColor("TabbedPane.contentAreaColor");
+            if (color != null) {
+                g.setColor(color);
+            } else if (selectColor == null || selectedIndex == -1) {
+                g.setColor(tabPane.getBackground());
+            } else {
+                g.setColor(selectColor);
+            }
+            // fill content area rect for both GTK and Nimbus LAF here
+            g.fillRect(x, y, w, h);
+        }
+
         ss.getPainter().paintTabbedPaneContentBackground(ss, g, x, y,
                                                            w, h);
         ss.getPainter().paintTabbedPaneContentBorder(ss, g, x, y, w, h);
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 66de5203d5731..da0e3f9c747ac 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
@@ -2974,10 +2974,10 @@ public void visitTypeTest(JCInstanceOf tree) {
             // preserving the side effects of the value
             VarSymbol dollar_s = new VarSymbol(FINAL | SYNTHETIC,
                     names.fromString("tmp" + tree.pos + this.target.syntheticNameChar()),
-                    tree.expr.type,
+                    types.erasure(tree.expr.type),
                     currentMethodSym);
             JCStatement var = make.at(tree.pos())
-                    .VarDef(dollar_s, instanceOfExpr).setType(dollar_s.type);
+                    .VarDef(dollar_s, instanceOfExpr);
 
             if (types.isUnconditionallyExact(tree.expr.type, tree.pattern.type)) {
                 exactnessCheck = make.Literal(BOOLEAN, 1).setType(syms.booleanType.constType(1));
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
index 3a1bb8072635c..20726bb8d4721 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -121,6 +121,9 @@ public List<String> run() {
     // whether to print debug info during startup
     private boolean showInfo = false;
 
+    // whether to allow legacy mechanisms
+    private boolean allowLegacy = false;
+
     // template manager, initialized from parsed attributes
     private TemplateManager templateManager;
 
@@ -251,6 +254,10 @@ boolean getShowInfo() {
         return (SunPKCS11.debug != null) || showInfo;
     }
 
+    boolean getAllowLegacy() {
+        return allowLegacy;
+    }
+
     TemplateManager getTemplateManager() {
         if (templateManager == null) {
             templateManager = new TemplateManager();
@@ -453,6 +460,8 @@ private void parse() throws IOException {
                 destroyTokenAfterLogout = parseBooleanEntry(st.sval);
             case "showInfo"->
                 showInfo = parseBooleanEntry(st.sval);
+            case "allowLegacy"->
+                allowLegacy = parseBooleanEntry(st.sval);
             case "keyStoreCompatibilityMode"->
                 keyStoreCompatibilityMode = parseBooleanEntry(st.sval);
             case "explicitCancel"->
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
index 3e112bfe0ede6..07aaa1037ea54 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -1222,25 +1222,6 @@ public Object run() {
         }
     }
 
-    private static boolean isLegacy(CK_MECHANISM_INFO mechInfo)
-            throws PKCS11Exception {
-        // assume full support if no mech info available
-        // For vendor-specific mechanisms, often no mech info is provided
-        boolean partialSupport = false;
-
-        if (mechInfo != null) {
-            if ((mechInfo.flags & CKF_DECRYPT) != 0) {
-                // non-legacy cipher mechs should support encryption
-                partialSupport |= ((mechInfo.flags & CKF_ENCRYPT) == 0);
-            }
-            if ((mechInfo.flags & CKF_VERIFY) != 0) {
-                // non-legacy signature mechs should support signing
-                partialSupport |= ((mechInfo.flags & CKF_SIGN) == 0);
-            }
-        }
-        return partialSupport;
-    }
-
     // test if a token is present and initialize this provider for it if so.
     // does nothing if no token is found
     // called from constructor and by poller
@@ -1309,12 +1290,6 @@ private void initToken(CK_SLOT_INFO slotInfo) throws PKCS11Exception {
                 }
                 continue;
             }
-            if (isLegacy(mechInfo)) {
-                if (showInfo) {
-                    System.out.println("DISABLED due to legacy");
-                }
-                continue;
-            }
 
             if (brokenMechanisms.contains(longMech)) {
                 if (showInfo) {
@@ -1336,6 +1311,7 @@ private void initToken(CK_SLOT_INFO slotInfo) throws PKCS11Exception {
             if (ds == null) {
                 continue;
             }
+            boolean allowLegacy = config.getAllowLegacy();
             descLoop:
             for (Descriptor d : ds) {
                 Integer oldMech = supportedAlgs.get(d);
@@ -1351,6 +1327,21 @@ private void initToken(CK_SLOT_INFO slotInfo) throws PKCS11Exception {
                             }
                         }
                     }
+
+                    // assume full support if no mech info available
+                    if (!allowLegacy && mechInfo != null) {
+                        if ((d.type == CIP &&
+                                (mechInfo.flags & CKF_ENCRYPT) == 0) ||
+                                (d.type == SIG &&
+                                (mechInfo.flags & CKF_SIGN) == 0)) {
+                            if (showInfo) {
+                                System.out.println("DISABLED " +  d.type +
+                                        " " + d.algorithm +
+                                        " due to partial support");
+                            }
+                            continue;
+                        }
+                    }
                     supportedAlgs.put(d, integerMech);
                     continue;
                 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
index 3dfb2bc5d1013..37b586116a50b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
@@ -40,6 +40,7 @@ public class FileMapInfo {
   private static Address rwRegionBaseAddress;
   private static Address rwRegionEndAddress;
   private static Address vtablesIndex;
+  private static Address mapped_base_address;
 
   // HashMap created by mapping the vTable addresses in the rw region with
   // the corresponding metadata type.
@@ -98,7 +99,7 @@ private static void initialize(TypeDataBase db) {
     // char* mapped_base_address = header->_mapped_base_address
     // size_t cloned_vtable_offset = header->_cloned_vtable_offset
     // CppVtableInfo** vtablesIndex = mapped_base_address + cloned_vtable_offset;
-    Address mapped_base_address = get_AddressField(FileMapHeader_type, header, "_mapped_base_address");
+    mapped_base_address = get_AddressField(FileMapHeader_type, header, "_mapped_base_address");
     long cloned_vtable_offset = get_CIntegerField(FileMapHeader_type, header, "_cloned_vtables_offset");
     vtablesIndex = mapped_base_address.addOffsetTo(cloned_vtable_offset);
 
@@ -168,23 +169,57 @@ public void createVtableTypeMapping() {
       vTableTypeMap = new HashMap<Address, Type>();
       long addressSize = VM.getVM().getAddressSize();
 
-      // vtablesIndex points to this:
-      //     class CppVtableInfo {
-      //         intptr_t _vtable_size;
-      //         intptr_t _cloned_vtable[1];
-      //         ...
-      //     };
-      //     CppVtableInfo** CppVtables::_index;
-      // This is the index of all the cloned vtables. E.g., for
+      // vtablesIndex points to to an array like this:
+      // long info[] = {
+      //   offset of the CppVtableInfo for ConstantPool,
+      //   offset of the CppVtableInfo for InstanceKlass,
+      //   offset of the CppVtableInfo for InstanceClassLoaderKlass,
+      //   ...
+      // };
+      //
+      // class CppVtableInfo {
+      //   intptr_t _vtable_size;
+      //   intptr_t _cloned_vtable[1];
+      //   ...
+      // };
+      //
+      // The loop below computes the following
+      //     CppVtableInfo* t_ConstantPool  = mapped_base_address + info[0];
+      //     CppVtableInfo* t_InstanceKlass = mapped_base_address + info[1];
+      //     ...
+      //
+      // If we have the following objects
       //     ConstantPool* cp = ....; // an archived constant pool
       //     InstanceKlass* ik = ....;// an archived class
-      // the following holds true:
-      //     &_index[ConstantPool_Kind]->_cloned_vtable[0]  == ((intptr_t**)cp)[0]
-      //     &_index[InstanceKlass_Kind]->_cloned_vtable[0] == ((intptr_t**)ik)[0]
+      //
+      // then the following holds true:
+      //     ((intptr_t**)cp)[0] == &t_ConstantPool->_cloned_vtable[0]  // The vtable for archived ConstantPools
+      //     ((intptr_t**)ik)[0] == &t_InstanceKlass->_cloned_vtable[0] // The vtable for archived InstanceKlasses
+      //
+      // To get an idea what these address look like, do this:
+      //
+      // $ java -Xlog:cds+vtables=debug -XX:+UnlockDiagnosticVMOptions -XX:ArchiveRelocationMode=0 --version
+      // [0.002s][debug][cds,vtables] Copying  14 vtable entries for ConstantPool to 0x800000018
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceKlass to 0x800000090
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceClassLoaderKlass to 0x8000001e0
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceMirrorKlass to 0x800000330
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceRefKlass to 0x800000480
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceStackChunkKlass to 0x8000005d0
+      // [0.002s][debug][cds,vtables] Copying  14 vtable entries for Method to 0x800000720
+      // [0.002s][debug][cds,vtables] Copying  42 vtable entries for ObjArrayKlass to 0x800000798
+      // [0.002s][debug][cds,vtables] Copying  42 vtable entries for TypeArrayKlass to 0x8000008f0
+      // java 23-internal 2024-09-17
+      // ...
 
       for (int i=0; i < metadataTypeArray.length; i++) {
-        Address vtableInfoAddress = vtablesIndex.getAddressAt(i * addressSize); // = _index[i]
-        Address vtableAddress = vtableInfoAddress.addOffsetTo(addressSize); // = &_index[i]->_cloned_vtable[0]
+        long vtable_offset = vtablesIndex.getJLongAt(i * addressSize); // long offset = _index[i]
+
+        // CppVtableInfo* t = the address of the CppVtableInfo for the i-th table
+        Address vtableInfoAddress = mapped_base_address.addOffsetTo(vtable_offset);
+
+        // vtableAddress = &t->_cloned_vtable[0]
+        Address vtableAddress = vtableInfoAddress.addOffsetTo(addressSize);
+
         vTableTypeMap.put(vtableAddress, metadataTypeArray[i]);
       }
     }
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
index a240fa725d42d..440d80d3b1abd 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -118,7 +118,7 @@ public Result authenticate (HttpExchange t)
             return new Authenticator.Retry (401);
         }
         int sp = auth.indexOf (' ');
-        if (sp == -1 || !auth.substring(0, sp).equals ("Basic")) {
+        if (sp == -1 || !auth.substring(0, sp).equalsIgnoreCase("Basic")) {
             return new Authenticator.Failure (401);
         }
         byte[] b = Base64.getDecoder().decode(auth.substring(sp+1));
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
index 11ad6c3eaaab2..aefb9b5d1fcc1 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -137,8 +137,14 @@ public void close () throws IOException {
         if (closed) {
             return;
         }
-        flush();
         try {
+            /*
+            * write any pending chunk data. manually write chunk rather than
+            * calling flush to avoid sending small packets
+            */
+            if (count > 0) {
+                writeChunk();
+            }
             /* write an empty chunk */
             writeChunk();
             out.flush();
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
index 770642fda117d..1119d1e386b3e 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -207,7 +207,7 @@ public void sendResponseHeaders (int rCode, long contentLen)
         }
         this.rcode = rCode;
         String statusLine = "HTTP/1.1 "+rCode+Code.msg(rCode)+"\r\n";
-        OutputStream tmpout = new BufferedOutputStream (ros);
+        ByteArrayOutputStream tmpout = new ByteArrayOutputStream();
         PlaceholderOutputStream o = getPlaceholderResponseBody();
         tmpout.write (bytes(statusLine, 0), 0, statusLine.length());
         boolean noContentToSend = false; // assume there is content
@@ -278,11 +278,11 @@ public void sendResponseHeaders (int rCode, long contentLen)
 
         write (rspHdrs, tmpout);
         this.rspContentLen = contentLen;
-        tmpout.flush() ;
-        tmpout = null;
+        tmpout.writeTo(ros);
         sentHeaders = true;
         logger.log(Level.TRACE, "Sent headers: noContentToSend=" + noContentToSend);
         if (noContentToSend) {
+            ros.flush();
             close();
         }
         server.logReply (rCode, req.requestLine(), null);
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
index add5092033662..49377475719c7 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -686,6 +687,7 @@ public void run () {
                             ServerImpl.this, chan
                         );
                     }
+                    rawout = new BufferedOutputStream(rawout);
                     connection.raw = rawin;
                     connection.rawout = rawout;
                 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
index 6d217174fddb7..81ddb58eecf0b 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,9 @@ public final class FileServerHandler implements HttpHandler {
     private static final List<String> SUPPORTED_METHODS = List.of("HEAD", "GET");
     private static final List<String> UNSUPPORTED_METHODS =
             List.of("CONNECT", "DELETE", "OPTIONS", "PATCH", "POST", "PUT", "TRACE");
+    private static final String FAVICON_RESOURCE_PATH =
+            "/sun/net/httpserver/simpleserver/resources/favicon.ico";
+    private static final String FAVICON_LAST_MODIFIED = "Mon, 23 May 1995 11:11:11 GMT";
 
     private final Path root;
     private final UnaryOperator<String> mimeTable;
@@ -250,6 +253,31 @@ private static Path indexFile(Path path) {
         return Files.exists(html) ? html : Files.exists(htm) ? htm : null;
     }
 
+    private static boolean isFavIconRequest(HttpExchange exchange) {
+        return "/favicon.ico".equals(exchange.getRequestURI().getPath());
+    }
+
+    private void serveDefaultFavIcon(HttpExchange exchange, boolean writeBody)
+            throws IOException
+    {
+        var respHdrs = exchange.getResponseHeaders();
+        try (var stream = getClass().getModule().getResourceAsStream(FAVICON_RESOURCE_PATH)) {
+            var bytes = stream.readAllBytes();
+            respHdrs.set("Content-Type", "image/x-icon");
+            respHdrs.set("Last-Modified", FAVICON_LAST_MODIFIED);
+            if (writeBody) {
+                exchange.sendResponseHeaders(200, bytes.length);
+                try (OutputStream os = exchange.getResponseBody()) {
+                    os.write(bytes);
+                }
+            } else {
+                respHdrs.set("Content-Length", Integer.toString(bytes.length));
+                exchange.sendResponseHeaders(200, -1);
+            }
+        }
+    }
+
+
     private void serveFile(HttpExchange exchange, Path path, boolean writeBody)
         throws IOException
     {
@@ -371,17 +399,26 @@ public void handle(HttpExchange exchange) throws IOException {
         assert List.of("GET", "HEAD").contains(exchange.getRequestMethod());
         try (exchange) {
             discardRequestBody(exchange);
+            boolean isHeadRequest = exchange.getRequestMethod().equals("HEAD");
             Path path = mapToPath(exchange, root);
             if (path != null) {
                 exchange.setAttribute("request-path", path.toString());  // store for OutputFilter
                 if (!Files.exists(path) || !Files.isReadable(path) || isHiddenOrSymLink(path)) {
                     handleNotFound(exchange);
-                } else if (exchange.getRequestMethod().equals("HEAD")) {
+                } else if (isHeadRequest) {
                     handleHEAD(exchange, path);
                 } else {
                     handleGET(exchange, path);
                 }
             } else {
+                if (isFavIconRequest(exchange)) {
+                    try {
+                        serveDefaultFavIcon(exchange, !isHeadRequest);
+                        return;
+                    } catch (IOException ignore) {
+                        // fall through to send the not-found response
+                    }
+                }
                 exchange.setAttribute("request-path", "could not resolve request URI path");
                 handleNotFound(exchange);
             }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
index 7e97d203b6c4e..88f72c7aeaea9 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -30,6 +30,7 @@
 import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 
 import java.io.PrintWriter;
+import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
@@ -169,6 +170,13 @@ void printStartMessage(Path root, HttpServer server)
             if (!addrSpecified) {
                 writer.println(ResourceBundleHelper.getMessage("loopback.info"));
             }
+            if (inetAddr instanceof Inet6Address && addr.contains(":") && !addr.startsWith("[")) {
+                // we use the "addr" when printing the URL, so make sure it
+                // conforms to RFC-2732, section 2:
+                // To use a literal IPv6 address in a URL, the literal
+                // address should be enclosed in "[" and "]" characters.
+                addr = "[" + addr + "]";
+            }
             if (isAnyLocal) {
                 writer.println(ResourceBundleHelper.getMessage("msg.start.anylocal", root, addr, port));
             } else {
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/favicon.ico b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/favicon.ico
new file mode 100644
index 0000000000000..f24905abf621f
Binary files /dev/null and b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/favicon.ico differ
diff --git a/src/jdk.internal.le/aix/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java b/src/jdk.internal.le/aix/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
deleted file mode 100644
index fe5e10e7e5d35..0000000000000
--- a/src/jdk.internal.le/aix/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 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.internal.org.jline.terminal.impl.jna;
-
-import java.io.IOException;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-class JDKNativePty {
-
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    static int isatty(int fd) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    static String ttyname(int fd) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
deleted file mode 100644
index 199e80d9dde5a..0000000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 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.internal.org.jline.terminal.impl.jna;
-
-import java.io.IOException;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.linux.LinuxNativePty;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-class JDKNativePty {
-
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-        return LinuxNativePty.current(console);
-    }
-
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
-        return LinuxNativePty.open(attr, size);
-    }
-
-    static int isatty(int fd) {
-        return LinuxNativePty.isatty(fd);
-    }
-
-    static String ttyname(int fd) {
-        return LinuxNativePty.ttyname(fd);
-    }
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary.java
deleted file mode 100644
index 5a3a43c6f5e9d..0000000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.linux;
-
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.List;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Platform;
-//import com.sun.jna.Structure;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Attributes.ControlChar;
-import jdk.internal.org.jline.terminal.Attributes.ControlFlag;
-import jdk.internal.org.jline.terminal.Attributes.InputFlag;
-import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
-import jdk.internal.org.jline.terminal.Attributes.OutputFlag;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-public interface CLibrary {//extends com.sun.jna.Library {
-
-    void tcgetattr(int fd, termios termios) throws LastErrorException;
-
-    void tcsetattr(int fd, int cmd, termios termios) throws LastErrorException;
-
-    void ioctl(int fd, int cmd, winsize data) throws LastErrorException;
-
-    int isatty(int fd);
-
-    void ttyname_r(int fd, byte[] buf, int len) throws LastErrorException;
-
-    class winsize { //extends Structure {
-        public short ws_row;
-        public short ws_col;
-        public short ws_xpixel;
-        public short ws_ypixel;
-
-        public winsize() {
-        }
-
-        public winsize(Size ws) {
-            ws_row = (short) ws.getRows();
-            ws_col = (short) ws.getColumns();
-        }
-
-        public Size toSize() {
-            return new Size(ws_col, ws_row);
-        }
-
-//        @Override
-//        protected List<String> getFieldOrder() {
-//            return Arrays.asList(//
-//                    "ws_row",//
-//                    "ws_col",//
-//                    "ws_xpixel",//
-//                    "ws_ypixel"//
-//            );
-//        }
-
-    }
-
-    class termios {// extends Structure {
-
-        public int c_iflag;
-        public int c_oflag;
-        public int c_cflag;
-        public int c_lflag;
-        public byte c_line;
-        public byte[] c_cc = new byte[32];
-        public int c_ispeed;
-        public int c_ospeed;
-
-//        @Override
-//        protected List<String> getFieldOrder() {
-//            return Arrays.asList(//
-//                    "c_iflag",//
-//                    "c_oflag",//
-//                    "c_cflag",//
-//                    "c_lflag",//
-//                    "c_line",//
-//                    "c_cc",//
-//                    "c_ispeed",//
-//                    "c_ospeed"//
-//            );
-//        }
-
-        public termios() {
-        }
-
-        public termios(Attributes t) {
-            // Input flags
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IGNBRK),           IGNBRK,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.BRKINT),           BRKINT,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IGNPAR),           IGNPAR,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.PARMRK),           PARMRK,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.INPCK),            INPCK,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.ISTRIP),           ISTRIP,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.INLCR),            INLCR,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IGNCR),            IGNCR,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.ICRNL),            ICRNL,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IXON),             IXON,       c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IXOFF),            IXOFF,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IXANY),            IXANY,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IMAXBEL),          IMAXBEL,    c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IUTF8),            IUTF8,      c_iflag);
-            // Output flags
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.OPOST),          OPOST,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.ONLCR),          ONLCR,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.OCRNL),          OCRNL,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.ONOCR),          ONOCR,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.ONLRET),         ONLRET,     c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.OFILL),          OFILL,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.NLDLY),          NLDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.TABDLY),         TABDLY,     c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.CRDLY),          CRDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.FFDLY),          FFDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.BSDLY),          BSDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.VTDLY),          VTDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.OFDEL),          OFDEL,      c_oflag);
-            // Control flags
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CS5),          CS5,        c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CS6),          CS6,        c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CS7),          CS7,        c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CS8),          CS8,        c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CSTOPB),       CSTOPB,     c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CREAD),        CREAD,      c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.PARENB),       PARENB,     c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.PARODD),       PARODD,     c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.HUPCL),        HUPCL,      c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CLOCAL),       CLOCAL,     c_cflag);
-            // Local flags
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOKE),           ECHOKE,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOE),            ECHOE,      c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOK),            ECHOK,      c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHO),             ECHO,       c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHONL),           ECHONL,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOPRT),          ECHOPRT,    c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOCTL),          ECHOCTL,    c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ISIG),             ISIG,       c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ICANON),           ICANON,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.EXTPROC),          EXTPROC,    c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.TOSTOP),           TOSTOP,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.FLUSHO),           FLUSHO,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.NOFLSH),           NOFLSH,     c_lflag);
-            // Control chars
-            c_cc[VEOF]      = (byte) t.getControlChar(ControlChar.VEOF);
-            c_cc[VEOL]      = (byte) t.getControlChar(ControlChar.VEOL);
-            c_cc[VEOL2]     = (byte) t.getControlChar(ControlChar.VEOL2);
-            c_cc[VERASE]    = (byte) t.getControlChar(ControlChar.VERASE);
-            c_cc[VWERASE]   = (byte) t.getControlChar(ControlChar.VWERASE);
-            c_cc[VKILL]     = (byte) t.getControlChar(ControlChar.VKILL);
-            c_cc[VREPRINT]  = (byte) t.getControlChar(ControlChar.VREPRINT);
-            c_cc[VINTR]     = (byte) t.getControlChar(ControlChar.VINTR);
-            c_cc[VQUIT]     = (byte) t.getControlChar(ControlChar.VQUIT);
-            c_cc[VSUSP]     = (byte) t.getControlChar(ControlChar.VSUSP);
-            c_cc[VSTART]    = (byte) t.getControlChar(ControlChar.VSTART);
-            c_cc[VSTOP]     = (byte) t.getControlChar(ControlChar.VSTOP);
-            c_cc[VLNEXT]    = (byte) t.getControlChar(ControlChar.VLNEXT);
-            c_cc[VDISCARD]  = (byte) t.getControlChar(ControlChar.VDISCARD);
-            c_cc[VMIN]      = (byte) t.getControlChar(ControlChar.VMIN);
-            c_cc[VTIME]     = (byte) t.getControlChar(ControlChar.VTIME);
-        }
-
-        private int setFlag(boolean flag, int value, int org) {
-            return flag ? (org | value) : org;
-        }
-
-        public Attributes toAttributes() {
-            Attributes attr = new Attributes();
-            // Input flags
-            EnumSet<InputFlag> iflag = attr.getInputFlags();
-            addFlag(c_iflag, iflag, InputFlag.IGNBRK,   IGNBRK);
-            addFlag(c_iflag, iflag, InputFlag.IGNBRK, IGNBRK);
-            addFlag(c_iflag, iflag, InputFlag.BRKINT, BRKINT);
-            addFlag(c_iflag, iflag, InputFlag.IGNPAR, IGNPAR);
-            addFlag(c_iflag, iflag, InputFlag.PARMRK, PARMRK);
-            addFlag(c_iflag, iflag, InputFlag.INPCK, INPCK);
-            addFlag(c_iflag, iflag, InputFlag.ISTRIP, ISTRIP);
-            addFlag(c_iflag, iflag, InputFlag.INLCR, INLCR);
-            addFlag(c_iflag, iflag, InputFlag.IGNCR, IGNCR);
-            addFlag(c_iflag, iflag, InputFlag.ICRNL, ICRNL);
-            addFlag(c_iflag, iflag, InputFlag.IXON, IXON);
-            addFlag(c_iflag, iflag, InputFlag.IXOFF, IXOFF);
-            addFlag(c_iflag, iflag, InputFlag.IXANY, IXANY);
-            addFlag(c_iflag, iflag, InputFlag.IMAXBEL, IMAXBEL);
-            addFlag(c_iflag, iflag, InputFlag.IUTF8, IUTF8);
-            // Output flags
-            EnumSet<OutputFlag> oflag = attr.getOutputFlags();
-            addFlag(c_oflag, oflag, OutputFlag.OPOST, OPOST);
-            addFlag(c_oflag, oflag, OutputFlag.ONLCR, ONLCR);
-            addFlag(c_oflag, oflag, OutputFlag.OCRNL, OCRNL);
-            addFlag(c_oflag, oflag, OutputFlag.ONOCR, ONOCR);
-            addFlag(c_oflag, oflag, OutputFlag.ONLRET, ONLRET);
-            addFlag(c_oflag, oflag, OutputFlag.OFILL, OFILL);
-            addFlag(c_oflag, oflag, OutputFlag.NLDLY, NLDLY);
-            addFlag(c_oflag, oflag, OutputFlag.TABDLY, TABDLY);
-            addFlag(c_oflag, oflag, OutputFlag.CRDLY, CRDLY);
-            addFlag(c_oflag, oflag, OutputFlag.FFDLY, FFDLY);
-            addFlag(c_oflag, oflag, OutputFlag.BSDLY, BSDLY);
-            addFlag(c_oflag, oflag, OutputFlag.VTDLY, VTDLY);
-            addFlag(c_oflag, oflag, OutputFlag.OFDEL, OFDEL);
-            // Control flags
-            EnumSet<ControlFlag> cflag = attr.getControlFlags();
-            addFlag(c_cflag, cflag, ControlFlag.CS5, CS5);
-            addFlag(c_cflag, cflag, ControlFlag.CS6, CS6);
-            addFlag(c_cflag, cflag, ControlFlag.CS7, CS7);
-            addFlag(c_cflag, cflag, ControlFlag.CS8, CS8);
-            addFlag(c_cflag, cflag, ControlFlag.CSTOPB, CSTOPB);
-            addFlag(c_cflag, cflag, ControlFlag.CREAD, CREAD);
-            addFlag(c_cflag, cflag, ControlFlag.PARENB, PARENB);
-            addFlag(c_cflag, cflag, ControlFlag.PARODD, PARODD);
-            addFlag(c_cflag, cflag, ControlFlag.HUPCL, HUPCL);
-            addFlag(c_cflag, cflag, ControlFlag.CLOCAL, CLOCAL);
-            // Local flags
-            EnumSet<LocalFlag> lflag = attr.getLocalFlags();
-            addFlag(c_lflag, lflag, LocalFlag.ECHOKE, ECHOKE);
-            addFlag(c_lflag, lflag, LocalFlag.ECHOE, ECHOE);
-            addFlag(c_lflag, lflag, LocalFlag.ECHOK, ECHOK);
-            addFlag(c_lflag, lflag, LocalFlag.ECHO, ECHO);
-            addFlag(c_lflag, lflag, LocalFlag.ECHONL, ECHONL);
-            addFlag(c_lflag, lflag, LocalFlag.ECHOPRT, ECHOPRT);
-            addFlag(c_lflag, lflag, LocalFlag.ECHOCTL, ECHOCTL);
-            addFlag(c_lflag, lflag, LocalFlag.ISIG, ISIG);
-            addFlag(c_lflag, lflag, LocalFlag.ICANON, ICANON);
-            addFlag(c_lflag, lflag, LocalFlag.EXTPROC, EXTPROC);
-            addFlag(c_lflag, lflag, LocalFlag.TOSTOP, TOSTOP);
-            addFlag(c_lflag, lflag, LocalFlag.FLUSHO, FLUSHO);
-            addFlag(c_lflag, lflag, LocalFlag.NOFLSH, NOFLSH);
-            // Control chars
-            EnumMap<ControlChar, Integer> cc = attr.getControlChars();
-            cc.put(ControlChar.VEOF,        (int) c_cc[VEOF]);
-            cc.put(ControlChar.VEOL,        (int) c_cc[VEOL]);
-            cc.put(ControlChar.VEOL2,       (int) c_cc[VEOL2]);
-            cc.put(ControlChar.VERASE,      (int) c_cc[VERASE]);
-            cc.put(ControlChar.VWERASE,     (int) c_cc[VWERASE]);
-            cc.put(ControlChar.VKILL,       (int) c_cc[VKILL]);
-            cc.put(ControlChar.VREPRINT,    (int) c_cc[VREPRINT]);
-            cc.put(ControlChar.VINTR,       (int) c_cc[VINTR]);
-            cc.put(ControlChar.VQUIT,       (int) c_cc[VQUIT]);
-            cc.put(ControlChar.VSUSP,       (int) c_cc[VSUSP]);
-            cc.put(ControlChar.VSTART,      (int) c_cc[VSTART]);
-            cc.put(ControlChar.VSTOP,       (int) c_cc[VSTOP]);
-            cc.put(ControlChar.VLNEXT,      (int) c_cc[VLNEXT]);
-            cc.put(ControlChar.VDISCARD,    (int) c_cc[VDISCARD]);
-            cc.put(ControlChar.VMIN,        (int) c_cc[VMIN]);
-            cc.put(ControlChar.VTIME,       (int) c_cc[VTIME]);
-            // Return
-            return attr;
-        }
-
-        private <T extends Enum<T>> void addFlag(int value, EnumSet<T> flags, T flag, int v) {
-            if ((value & v) != 0) {
-                flags.add(flag);
-            }
-        }
-    }
-
-    // CONSTANTS
-
-    int TIOCGWINSZ = /*Platform.isMIPS() || Platform.isPPC() || Platform.isSPARC() ? 0x40087468 : */0x00005413;
-    int TIOCSWINSZ = /*Platform.isMIPS() || Platform.isPPC() || Platform.isSPARC() ? 0x80087467 : */0x00005414;
-
-    int VINTR       = 0;
-    int VQUIT       = 1;
-    int VERASE      = 2;
-    int VKILL       = 3;
-    int VEOF        = 4;
-    int VTIME       = 5;
-    int VMIN        = 6;
-    int VSWTC       = 7;
-    int VSTART      = 8;
-    int VSTOP       = 9;
-    int VSUSP       = 10;
-    int VEOL        = 11;
-    int VREPRINT    = 12;
-    int VDISCARD    = 13;
-    int VWERASE     = 14;
-    int VLNEXT      = 15;
-    int VEOL2       = 16;
-
-    int IGNBRK =   0x0000001;
-    int BRKINT =   0x0000002;
-    int IGNPAR =   0x0000004;
-    int PARMRK =   0x0000008;
-    int INPCK =    0x0000010;
-    int ISTRIP =   0x0000020;
-    int INLCR =    0x0000040;
-    int IGNCR =    0x0000080;
-    int ICRNL =    0x0000100;
-    int IUCLC =    0x0000200;
-    int IXON =     0x0000400;
-    int IXANY =    0x0000800;
-    int IXOFF =    0x0001000;
-    int IMAXBEL =  0x0002000;
-    int IUTF8 =    0x0004000;
-
-    int OPOST =    0x0000001;
-    int OLCUC =    0x0000002;
-    int ONLCR =    0x0000004;
-    int OCRNL =    0x0000008;
-    int ONOCR =    0x0000010;
-    int ONLRET =   0x0000020;
-    int OFILL =    0x0000040;
-    int OFDEL =    0x0000080;
-    int NLDLY =    0x0000100;
-      int NL0 =    0x0000000;
-      int NL1 =    0x0000100;
-    int CRDLY =    0x0000600;
-      int CR0 =    0x0000000;
-      int CR1 =    0x0000200;
-      int CR2 =    0x0000400;
-      int CR3 =    0x0000600;
-    int TABDLY =   0x0001800;
-      int TAB0 =   0x0000000;
-      int TAB1 =   0x0000800;
-      int TAB2 =   0x0001000;
-      int TAB3 =   0x0001800;
-      int XTABS =  0x0001800;
-    int BSDLY =    0x0002000;
-      int BS0 =    0x0000000;
-      int BS1 =    0x0002000;
-    int VTDLY =    0x0004000;
-      int VT0 =    0x0000000;
-      int VT1 =    0x0004000;
-    int FFDLY =    0x0008000;
-      int FF0 =    0x0000000;
-      int FF1 =    0x0008000;
-
-    int CBAUD =    0x000100f;
-     int B0 =      0x0000000;
-     int B50 =     0x0000001;
-     int B75 =     0x0000002;
-     int B110 =    0x0000003;
-     int B134 =    0x0000004;
-     int B150 =    0x0000005;
-     int B200 =    0x0000006;
-     int B300 =    0x0000007;
-     int B600 =    0x0000008;
-     int B1200 =   0x0000009;
-     int B1800 =   0x000000a;
-     int B2400 =   0x000000b;
-     int B4800 =   0x000000c;
-     int B9600 =   0x000000d;
-     int B19200 =  0x000000e;
-     int B38400 =  0x000000f;
-    int EXTA =  B19200;
-    int EXTB =  B38400;
-    int CSIZE =    0x0000030;
-      int CS5 =    0x0000000;
-      int CS6 =    0x0000010;
-      int CS7 =    0x0000020;
-      int CS8 =    0x0000030;
-    int CSTOPB =   0x0000040;
-    int CREAD =    0x0000080;
-    int PARENB =   0x0000100;
-    int PARODD =   0x0000200;
-    int HUPCL =    0x0000400;
-    int CLOCAL =   0x0000800;
-
-    int ISIG =     0x0000001;
-    int ICANON =   0x0000002;
-    int XCASE =    0x0000004;
-    int ECHO =     0x0000008;
-    int ECHOE =    0x0000010;
-    int ECHOK =    0x0000020;
-    int ECHONL =   0x0000040;
-    int NOFLSH =   0x0000080;
-    int TOSTOP =   0x0000100;
-    int ECHOCTL =  0x0000200;
-    int ECHOPRT =  0x0000400;
-    int ECHOKE =   0x0000800;
-    int FLUSHO =   0x0001000;
-    int PENDIN =   0x0002000;
-    int IEXTEN =   0x0008000;
-    int EXTPROC =  0x0010000;
-
-    int TCSANOW =          0x0;
-    int TCSADRAIN =        0x1;
-    int TCSAFLUSH =        0x2;
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibraryImpl.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibraryImpl.java
deleted file mode 100644
index 732f2d15d1e11..0000000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibraryImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 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.internal.org.jline.terminal.impl.jna.linux;
-
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-public final class CLibraryImpl implements CLibrary {
-
-    static {
-        System.loadLibrary("le");
-        initIDs();
-    }
-
-    private static native void initIDs();
-
-    @Override
-    public native void tcgetattr(int fd, termios termios) throws LastErrorException;
-
-    @Override
-    public native void tcsetattr(int fd, int cmd, termios termios) throws LastErrorException;
-
-    @Override
-    public void ioctl(int fd, int cmd, winsize data) throws LastErrorException {
-        if (cmd == CLibrary.TIOCGWINSZ || cmd == CLibrary.TIOCSWINSZ) {
-            ioctl0(fd, cmd, data);
-        } else {
-            throw new UnsupportedOperationException("Command: " + cmd + ", not supported.");
-        }
-    }
-
-    private native void ioctl0(int fd, int cmd, winsize data) throws LastErrorException;
-
-    @Override
-    public native int isatty(int fd);
-
-    @Override
-    public native void ttyname_r(int fd, byte[] buf, int len) throws LastErrorException;
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/LinuxNativePty.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/LinuxNativePty.java
deleted file mode 100644
index b2cd60c08e72d..0000000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/LinuxNativePty.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.linux;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Native;
-//import com.sun.jna.Platform;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.JnaNativePty;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TCSADRAIN;
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TIOCGWINSZ;
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TIOCSWINSZ;
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.termios;
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.winsize;
-
-public class LinuxNativePty extends JnaNativePty {
-
-//    private static final CLibrary C_LIBRARY = Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
-    private static final CLibrary C_LIBRARY = new CLibraryImpl();
-
-    public interface UtilLibrary {// extends com.sun.jna.Library {
-
-        void openpty(int[] master, int[] slave, byte[] name, CLibrary.termios t, CLibrary.winsize s) throws LastErrorException;
-
-//        UtilLibrary INSTANCE = Native.load("util", UtilLibrary.class);
-        UtilLibrary INSTANCE = new UtilLibraryImpl();
-    }
-
-    public static LinuxNativePty current(TerminalProvider.Stream consoleStream) throws IOException {
-        switch (consoleStream) {
-            case Output:
-                return new LinuxNativePty(-1, null, 0, FileDescriptor.in, 1, FileDescriptor.out, ttyname(0));
-            case Error:
-                return new LinuxNativePty(-1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
-            default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + consoleStream);
-        }
-    }
-
-    public static LinuxNativePty open(Attributes attr, Size size) throws IOException {
-        int[] master = new int[1];
-        int[] slave = new int[1];
-        byte[] buf = new byte[64];
-        UtilLibrary.INSTANCE.openpty(master, slave, buf,
-                attr != null ? new termios(attr) : null,
-                size != null ? new winsize(size) : null);
-        int len = 0;
-        while (buf[len] != 0) {
-            len++;
-        }
-        String name = new String(buf, 0, len);
-        return new LinuxNativePty(master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
-    }
-
-    public LinuxNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, String name) {
-        super(master, masterFD, slave, slaveFD, name);
-    }
-
-    public LinuxNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, int slaveOut, FileDescriptor slaveOutFD, String name) {
-        super(master, masterFD, slave, slaveFD, slaveOut, slaveOutFD, name);
-    }
-
-    @Override
-    public Attributes getAttr() throws IOException {
-        termios termios = new termios();
-        C_LIBRARY.tcgetattr(getSlave(), termios);
-        return termios.toAttributes();
-    }
-
-    @Override
-    protected void doSetAttr(Attributes attr) throws IOException {
-        termios termios = new termios(attr);
-        termios org = new termios();
-        C_LIBRARY.tcgetattr(getSlave(), org);
-        org.c_iflag = termios.c_iflag;
-        org.c_oflag = termios.c_oflag;
-        org.c_lflag = termios.c_lflag;
-        System.arraycopy(termios.c_cc, 0, org.c_cc, 0, termios.c_cc.length);
-        C_LIBRARY.tcsetattr(getSlave(), TCSADRAIN, org);
-    }
-
-    @Override
-    public Size getSize() throws IOException {
-        winsize sz = new winsize();
-        C_LIBRARY.ioctl(getSlave(), TIOCGWINSZ, sz);
-        return sz.toSize();
-    }
-
-    @Override
-    public void setSize(Size size) throws IOException {
-        winsize sz = new winsize(size);
-        C_LIBRARY.ioctl(getSlave(), TIOCSWINSZ, sz);
-    }
-
-    public static int isatty(int fd) {
-        return C_LIBRARY.isatty(fd);
-    }
-
-    public static String ttyname(int slave) {
-        byte[] buf = new byte[64];
-        C_LIBRARY.ttyname_r(slave, buf, buf.length);
-        int len = 0;
-        while (buf[len] != 0) {
-            len++;
-        }
-        return new String(buf, 0, len);
-    }
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/UtilLibraryImpl.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/UtilLibraryImpl.java
deleted file mode 100644
index 0bc8fa3994ed5..0000000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/UtilLibraryImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 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.internal.org.jline.terminal.impl.jna.linux;
-
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-import jdk.internal.org.jline.terminal.impl.jna.linux.LinuxNativePty.UtilLibrary;
-
-public final class UtilLibraryImpl implements UtilLibrary {
-
-    @Override
-    public void openpty(int[] master, int[] slave, byte[] name, CLibrary.termios t, CLibrary.winsize s) throws LastErrorException {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/src/jdk.internal.le/linux/native/lible/CLibrary.cpp b/src/jdk.internal.le/linux/native/lible/CLibrary.cpp
deleted file mode 100644
index 3215e1f5013bf..0000000000000
--- a/src/jdk.internal.le/linux/native/lible/CLibrary.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-static jclass lastErrorExceptionClass;
-static jmethodID lastErrorExceptionConstructor;
-
-static jclass termios_j;
-static jfieldID c_iflag;
-static jfieldID c_oflag;
-static jfieldID c_cflag;
-static jfieldID c_lflag;
-static jfieldID c_line;
-static jfieldID c_cc;
-static jfieldID c_ispeed;
-static jfieldID c_ospeed;
-
-static jclass winsize_j;
-static jfieldID ws_row;
-static jfieldID ws_col;
-static jfieldID ws_xpixel;
-static jfieldID ws_ypixel;
-
-static void throw_errno(JNIEnv *env);
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_initIDs
-  (JNIEnv *env, jclass unused) {
-    jclass cls;
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/LastErrorException");
-    CHECK_NULL(cls);
-    lastErrorExceptionClass = (jclass) env->NewGlobalRef(cls);
-    lastErrorExceptionConstructor = env->GetMethodID(lastErrorExceptionClass, "<init>", "(J)V");
-    CHECK_NULL(lastErrorExceptionConstructor);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary$termios");
-    CHECK_NULL(cls);
-    termios_j = (jclass) env->NewGlobalRef(cls);
-    c_iflag = env->GetFieldID(termios_j, "c_iflag", "I");
-    CHECK_NULL(c_iflag);
-    c_oflag = env->GetFieldID(termios_j, "c_oflag", "I");
-    CHECK_NULL(c_oflag);
-    c_cflag = env->GetFieldID(termios_j, "c_cflag", "I");
-    CHECK_NULL(c_cflag);
-    c_lflag = env->GetFieldID(termios_j, "c_lflag", "I");
-    CHECK_NULL(c_lflag);
-    c_line = env->GetFieldID(termios_j, "c_line", "B");
-    CHECK_NULL(c_line);
-    c_cc = env->GetFieldID(termios_j, "c_cc", "[B");
-    CHECK_NULL(c_cc);
-    c_ispeed = env->GetFieldID(termios_j, "c_ispeed", "I");
-    CHECK_NULL(c_ispeed);
-    c_ospeed = env->GetFieldID(termios_j, "c_ospeed", "I");
-    CHECK_NULL(c_ospeed);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary$winsize");
-    CHECK_NULL(cls);
-    winsize_j = (jclass) env->NewGlobalRef(cls);
-    ws_row = env->GetFieldID(winsize_j, "ws_row", "S");
-    CHECK_NULL(ws_row);
-    ws_col = env->GetFieldID(winsize_j, "ws_col", "S");
-    CHECK_NULL(ws_col);
-    ws_xpixel= env->GetFieldID(winsize_j, "ws_xpixel", "S");
-    CHECK_NULL(ws_xpixel);
-    ws_ypixel= env->GetFieldID(winsize_j, "ws_ypixel", "S");
-    CHECK_NULL(ws_ypixel);
-}
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_tcgetattr
-  (JNIEnv *env, jobject, jint fd, jobject result) {
-    termios data;
-
-    if (tcgetattr(fd, &data) != 0) {
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetIntField(result, c_iflag, data.c_iflag);
-    env->SetIntField(result, c_oflag, data.c_oflag);
-    env->SetIntField(result, c_cflag, data.c_cflag);
-    env->SetIntField(result, c_lflag, data.c_lflag);
-    env->SetIntField(result, c_line, data.c_line);
-    jbyteArray c_ccValue = (jbyteArray) env->GetObjectField(result, c_cc);
-    env->SetByteArrayRegion(c_ccValue, 0, NCCS, (signed char *) data.c_cc);//TODO: cast?
-    env->SetIntField(result, c_ispeed, cfgetispeed(&data));
-    env->SetIntField(result, c_ospeed, cfgetospeed(&data));
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl
- * Method:    tcsetattr
- * Signature: (IILjdk/internal/org/jline/terminal/impl/jna/linux/CLibrary/termios;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_tcsetattr
-  (JNIEnv *env, jobject, jint fd, jint cmd, jobject input) {
-    termios data;
-
-    data.c_iflag = env->GetIntField(input, c_iflag);
-    data.c_oflag = env->GetIntField(input, c_oflag);
-    data.c_cflag = env->GetIntField(input, c_cflag);
-    data.c_lflag = env->GetIntField(input, c_lflag);
-    data.c_line = env->GetIntField(input, c_line);
-    jbyteArray c_ccValue = (jbyteArray) env->GetObjectField(input, c_cc);
-    env->GetByteArrayRegion(c_ccValue, 0, NCCS, (jbyte *) data.c_cc);
-    cfsetispeed(&data, env->GetIntField(input, c_ispeed));
-    cfsetospeed(&data, env->GetIntField(input, c_ospeed));
-
-    if (tcsetattr(fd, cmd, &data) != 0) {
-        throw_errno(env);
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl
- * Method:    ioctl0
- * Signature: (IILjdk/internal/org/jline/terminal/impl/jna/linux/CLibrary/winsize;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0
-  (JNIEnv *env, jobject, jint fd, jint cmd, jobject data) {
-    winsize ws;
-
-    ws.ws_row = env->GetShortField(data, ws_row);
-    ws.ws_col = env->GetShortField(data, ws_col);
-    ws.ws_xpixel = env->GetShortField(data, ws_xpixel);
-    ws.ws_ypixel = env->GetShortField(data, ws_ypixel);
-
-    if (ioctl(fd, cmd, &ws) != 0) {
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetShortField(data, ws_row, ws.ws_row);
-    env->SetShortField(data, ws_col, ws.ws_col);
-    env->SetShortField(data, ws_xpixel, ws.ws_xpixel);
-    env->SetShortField(data, ws_ypixel, ws.ws_ypixel);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl
- * Method:    isatty
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_isatty
-  (JNIEnv *, jobject, jint fd) {
-    return isatty(fd);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl
- * Method:    ttyname_r
- * Signature: (I[BI)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ttyname_1r
-  (JNIEnv *env, jobject, jint fd, jbyteArray buf, jint len) {
-    char *data = new char[len];
-    int error = ttyname_r(fd, data, len);
-
-    if (error != 0) {
-        delete[] data;
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetByteArrayRegion(buf, 0, len, (jbyte *) data);
-    delete[] data;
-}
-
-/*
- * Throws LastErrorException based on the errno:
- */
-static void throw_errno(JNIEnv *env) {
-    jobject exc = env->NewObject(lastErrorExceptionClass,
-                                 lastErrorExceptionConstructor,
-                                 errno);
-    env->Throw((jthrowable) exc);
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
deleted file mode 100644
index 24b6213ca8967..0000000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 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.internal.org.jline.terminal.impl.jna;
-
-import java.io.IOException;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.osx.OsXNativePty;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-class JDKNativePty {
-
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-        return OsXNativePty.current(console);
-    }
-
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
-        return OsXNativePty.open(attr, size);
-    }
-
-    static int isatty(int fd) {
-        return OsXNativePty.isatty(fd);
-    }
-
-    static String ttyname(int fd) {
-        return OsXNativePty.ttyname(fd);
-    }
-
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary.java
deleted file mode 100644
index 02c2b9224e413..0000000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.osx;
-
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.List;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.NativeLong;
-//import com.sun.jna.Structure;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Attributes.ControlChar;
-import jdk.internal.org.jline.terminal.Attributes.ControlFlag;
-import jdk.internal.org.jline.terminal.Attributes.InputFlag;
-import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
-import jdk.internal.org.jline.terminal.Attributes.OutputFlag;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-public interface CLibrary {//extends com.sun.jna.Library {
-
-    void tcgetattr(int fd, termios termios) throws LastErrorException;
-
-    void tcsetattr(int fd, int cmd, termios termios) throws LastErrorException;
-
-    void ioctl(int fd, NativeLong cmd, winsize data) throws LastErrorException;
-
-    int isatty(int fd);
-
-    void ttyname_r(int fd, byte[] buf, int len) throws LastErrorException;
-
-    void openpty(int[] master, int[] slave, byte[] name, termios t, winsize s) throws LastErrorException;
-
-    class winsize { //extends Structure {
-        public short ws_row;
-        public short ws_col;
-        public short ws_xpixel;
-        public short ws_ypixel;
-
-        public winsize() {
-        }
-
-        public winsize(Size ws) {
-            ws_row = (short) ws.getRows();
-            ws_col = (short) ws.getColumns();
-        }
-
-        public Size toSize() {
-            return new Size(ws_col, ws_row);
-        }
-
-//        @Override
-//        protected List<String> getFieldOrder() {
-//            return Arrays.asList(//
-//                    "ws_row",//
-//                    "ws_col",//
-//                    "ws_xpixel",//
-//                    "ws_ypixel"//
-//            );
-//        }
-
-    }
-
-    class termios { //extends Structure {
-
-        public NativeLong c_iflag;
-        public NativeLong c_oflag;
-        public NativeLong c_cflag;
-        public NativeLong c_lflag;
-        public byte[] c_cc = new byte[20];
-        public NativeLong c_ispeed;
-        public NativeLong c_ospeed;
-
-//        @Override
-//        protected List<String> getFieldOrder() {
-//            return Arrays.asList(//
-//                    "c_iflag",//
-//                    "c_oflag",//
-//                    "c_cflag",//
-//                    "c_lflag",//
-//                    "c_cc",//
-//                    "c_ispeed",//
-//                    "c_ospeed"//
-//            );
-//        }
-
-        {
-            c_iflag  = new NativeLong(0);
-            c_oflag  = new NativeLong(0);
-            c_cflag  = new NativeLong(0);
-            c_lflag  = new NativeLong(0);
-            c_ispeed = new NativeLong(0);
-            c_ospeed = new NativeLong(0);
-        }
-
-        public termios() {
-        }
-
-        public termios(Attributes t) {
-            // Input flags
-            setFlag(t.getInputFlag(InputFlag.IGNBRK),           IGNBRK,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.BRKINT),           BRKINT,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IGNPAR),           IGNPAR,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.PARMRK),           PARMRK,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.INPCK),            INPCK,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.ISTRIP),           ISTRIP,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.INLCR),            INLCR,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IGNCR),            IGNCR,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.ICRNL),            ICRNL,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IXON),             IXON,       c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IXOFF),            IXOFF,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IXANY),            IXANY,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IMAXBEL),          IMAXBEL,    c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IUTF8),            IUTF8,      c_iflag);
-            // Output flags
-            setFlag(t.getOutputFlag(OutputFlag.OPOST),          OPOST,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.ONLCR),          ONLCR,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.OXTABS),         OXTABS,     c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.ONOEOT),         ONOEOT,     c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.OCRNL),          OCRNL,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.ONOCR),          ONOCR,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.ONLRET),         ONLRET,     c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.OFILL),          OFILL,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.NLDLY),          NLDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.TABDLY),         TABDLY,     c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.CRDLY),          CRDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.FFDLY),          FFDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.BSDLY),          BSDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.VTDLY),          VTDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.OFDEL),          OFDEL,      c_oflag);
-            // Control flags
-            setFlag(t.getControlFlag(ControlFlag.CIGNORE),      CIGNORE,    c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CS5),          CS5,        c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CS6),          CS6,        c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CS7),          CS7,        c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CS8),          CS8,        c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CSTOPB),       CSTOPB,     c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CREAD),        CREAD,      c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.PARENB),       PARENB,     c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.PARODD),       PARODD,     c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.HUPCL),        HUPCL,      c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CLOCAL),       CLOCAL,     c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CCTS_OFLOW),   CCTS_OFLOW, c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CRTS_IFLOW),   CRTS_IFLOW, c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CDTR_IFLOW),   CDTR_IFLOW, c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CDSR_OFLOW),   CDSR_OFLOW, c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CCAR_OFLOW),   CCAR_OFLOW, c_cflag);
-            // Local flags
-            setFlag(t.getLocalFlag(LocalFlag.ECHOKE),           ECHOKE,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHOE),            ECHOE,      c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHOK),            ECHOK,      c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHO),             ECHO,       c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHONL),           ECHONL,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHOPRT),          ECHOPRT,    c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHOCTL),          ECHOCTL,    c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ISIG),             ISIG,       c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ICANON),           ICANON,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ALTWERASE),        ALTWERASE,  c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.IEXTEN),           IEXTEN,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.EXTPROC),          EXTPROC,    c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.TOSTOP),           TOSTOP,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.FLUSHO),           FLUSHO,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.NOKERNINFO),       NOKERNINFO, c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.PENDIN),           PENDIN,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.NOFLSH),           NOFLSH,     c_lflag);
-            // Control chars
-            c_cc[VEOF]      = (byte) t.getControlChar(ControlChar.VEOF);
-            c_cc[VEOL]      = (byte) t.getControlChar(ControlChar.VEOL);
-            c_cc[VEOL2]     = (byte) t.getControlChar(ControlChar.VEOL2);
-            c_cc[VERASE]    = (byte) t.getControlChar(ControlChar.VERASE);
-            c_cc[VWERASE]   = (byte) t.getControlChar(ControlChar.VWERASE);
-            c_cc[VKILL]     = (byte) t.getControlChar(ControlChar.VKILL);
-            c_cc[VREPRINT]  = (byte) t.getControlChar(ControlChar.VREPRINT);
-            c_cc[VINTR]     = (byte) t.getControlChar(ControlChar.VINTR);
-            c_cc[VQUIT]     = (byte) t.getControlChar(ControlChar.VQUIT);
-            c_cc[VSUSP]     = (byte) t.getControlChar(ControlChar.VSUSP);
-            c_cc[VDSUSP]    = (byte) t.getControlChar(ControlChar.VDSUSP);
-            c_cc[VSTART]    = (byte) t.getControlChar(ControlChar.VSTART);
-            c_cc[VSTOP]     = (byte) t.getControlChar(ControlChar.VSTOP);
-            c_cc[VLNEXT]    = (byte) t.getControlChar(ControlChar.VLNEXT);
-            c_cc[VDISCARD]  = (byte) t.getControlChar(ControlChar.VDISCARD);
-            c_cc[VMIN]      = (byte) t.getControlChar(ControlChar.VMIN);
-            c_cc[VTIME]     = (byte) t.getControlChar(ControlChar.VTIME);
-            c_cc[VSTATUS]   = (byte) t.getControlChar(ControlChar.VSTATUS);
-        }
-
-        private void setFlag(boolean flag, long value, NativeLong org) {
-            org.setValue(flag ? org.longValue() | value : org.longValue());
-        }
-
-        public Attributes toAttributes() {
-            Attributes attr = new Attributes();
-            // Input flags
-            EnumSet<InputFlag> iflag = attr.getInputFlags();
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IGNBRK,   IGNBRK);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IGNBRK, IGNBRK);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.BRKINT, BRKINT);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IGNPAR, IGNPAR);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.PARMRK, PARMRK);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.INPCK, INPCK);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.ISTRIP, ISTRIP);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.INLCR, INLCR);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IGNCR, IGNCR);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.ICRNL, ICRNL);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IXON, IXON);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IXOFF, IXOFF);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IXANY, IXANY);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IMAXBEL, IMAXBEL);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IUTF8, IUTF8);
-            // Output flags
-            EnumSet<OutputFlag> oflag = attr.getOutputFlags();
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OPOST, OPOST);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.ONLCR, ONLCR);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OXTABS, OXTABS);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.ONOEOT, ONOEOT);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OCRNL, OCRNL);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.ONOCR, ONOCR);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.ONLRET, ONLRET);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OFILL, OFILL);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.NLDLY, NLDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.TABDLY, TABDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.CRDLY, CRDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.FFDLY, FFDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.BSDLY, BSDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.VTDLY, VTDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OFDEL, OFDEL);
-            // Control flags
-            EnumSet<ControlFlag> cflag = attr.getControlFlags();
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CIGNORE, CIGNORE);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CS5, CS5);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CS6, CS6);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CS7, CS7);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CS8, CS8);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CSTOPB, CSTOPB);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CREAD, CREAD);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.PARENB, PARENB);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.PARODD, PARODD);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.HUPCL, HUPCL);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CLOCAL, CLOCAL);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CCTS_OFLOW, CCTS_OFLOW);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CRTS_IFLOW, CRTS_IFLOW);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CDSR_OFLOW, CDSR_OFLOW);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CCAR_OFLOW, CCAR_OFLOW);
-            // Local flags
-            EnumSet<LocalFlag> lflag = attr.getLocalFlags();
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOKE, ECHOKE);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOE, ECHOE);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOK, ECHOK);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHO, ECHO);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHONL, ECHONL);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOPRT, ECHOPRT);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOCTL, ECHOCTL);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ISIG, ISIG);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ICANON, ICANON);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ALTWERASE, ALTWERASE);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.IEXTEN, IEXTEN);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.EXTPROC, EXTPROC);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.TOSTOP, TOSTOP);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.FLUSHO, FLUSHO);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.NOKERNINFO, NOKERNINFO);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.PENDIN, PENDIN);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.NOFLSH, NOFLSH);
-            // Control chars
-            EnumMap<ControlChar, Integer> cc = attr.getControlChars();
-            cc.put(ControlChar.VEOF,        (int) c_cc[VEOF]);
-            cc.put(ControlChar.VEOL,        (int) c_cc[VEOL]);
-            cc.put(ControlChar.VEOL2,       (int) c_cc[VEOL2]);
-            cc.put(ControlChar.VERASE,      (int) c_cc[VERASE]);
-            cc.put(ControlChar.VWERASE,     (int) c_cc[VWERASE]);
-            cc.put(ControlChar.VKILL,       (int) c_cc[VKILL]);
-            cc.put(ControlChar.VREPRINT,    (int) c_cc[VREPRINT]);
-            cc.put(ControlChar.VINTR,       (int) c_cc[VINTR]);
-            cc.put(ControlChar.VQUIT,       (int) c_cc[VQUIT]);
-            cc.put(ControlChar.VSUSP,       (int) c_cc[VSUSP]);
-            cc.put(ControlChar.VDSUSP,      (int) c_cc[VDSUSP]);
-            cc.put(ControlChar.VSTART,      (int) c_cc[VSTART]);
-            cc.put(ControlChar.VSTOP,       (int) c_cc[VSTOP]);
-            cc.put(ControlChar.VLNEXT,      (int) c_cc[VLNEXT]);
-            cc.put(ControlChar.VDISCARD,    (int) c_cc[VDISCARD]);
-            cc.put(ControlChar.VMIN,        (int) c_cc[VMIN]);
-            cc.put(ControlChar.VTIME,       (int) c_cc[VTIME]);
-            cc.put(ControlChar.VSTATUS,     (int) c_cc[VSTATUS]);
-            // Return
-            return attr;
-        }
-
-        private <T extends Enum<T>> void addFlag(long value, EnumSet<T> flags, T flag, int v) {
-            if ((value & v) != 0) {
-                flags.add(flag);
-            }
-        }
-    }
-
-    // CONSTANTS
-
-     long TIOCGWINSZ = 0x40087468L;
-     long TIOCSWINSZ = 0x80087467L;
-
-     int TCSANOW     = 0x00000000;
-
-     int VEOF        = 0;
-     int VEOL        = 1;
-     int VEOL2       = 2;
-     int VERASE      = 3;
-     int VWERASE     = 4;
-     int VKILL       = 5;
-     int VREPRINT    = 6;
-     int VINTR       = 8;
-     int VQUIT       = 9;
-     int VSUSP       = 10;
-     int VDSUSP      = 11;
-     int VSTART      = 12;
-     int VSTOP       = 13;
-     int VLNEXT      = 14;
-     int VDISCARD    = 15;
-     int VMIN        = 16;
-     int VTIME       = 17;
-     int VSTATUS     = 18;
-
-     int IGNBRK      = 0x00000001;
-     int BRKINT      = 0x00000002;
-     int IGNPAR      = 0x00000004;
-     int PARMRK      = 0x00000008;
-     int INPCK       = 0x00000010;
-     int ISTRIP      = 0x00000020;
-     int INLCR       = 0x00000040;
-     int IGNCR       = 0x00000080;
-     int ICRNL       = 0x00000100;
-     int IXON        = 0x00000200;
-     int IXOFF       = 0x00000400;
-     int IXANY       = 0x00000800;
-     int IMAXBEL     = 0x00002000;
-     int IUTF8       = 0x00004000;
-
-     int OPOST       = 0x00000001;
-     int ONLCR       = 0x00000002;
-     int OXTABS      = 0x00000004;
-     int ONOEOT      = 0x00000008;
-     int OCRNL       = 0x00000010;
-     int ONOCR       = 0x00000020;
-     int ONLRET      = 0x00000040;
-     int OFILL       = 0x00000080;
-     int NLDLY       = 0x00000300;
-     int TABDLY      = 0x00000c04;
-     int CRDLY       = 0x00003000;
-     int FFDLY       = 0x00004000;
-     int BSDLY       = 0x00008000;
-     int VTDLY       = 0x00010000;
-     int OFDEL       = 0x00020000;
-
-     int CIGNORE     = 0x00000001;
-     int CS5         = 0x00000000;
-     int CS6         = 0x00000100;
-     int CS7         = 0x00000200;
-     int CS8         = 0x00000300;
-     int CSTOPB      = 0x00000400;
-     int CREAD       = 0x00000800;
-     int PARENB      = 0x00001000;
-     int PARODD      = 0x00002000;
-     int HUPCL       = 0x00004000;
-     int CLOCAL      = 0x00008000;
-     int CCTS_OFLOW  = 0x00010000;
-     int CRTS_IFLOW  = 0x00020000;
-     int CDTR_IFLOW  = 0x00040000;
-     int CDSR_OFLOW  = 0x00080000;
-     int CCAR_OFLOW  = 0x00100000;
-
-     int ECHOKE      = 0x00000001;
-     int ECHOE       = 0x00000002;
-     int ECHOK       = 0x00000004;
-     int ECHO        = 0x00000008;
-     int ECHONL      = 0x00000010;
-     int ECHOPRT     = 0x00000020;
-     int ECHOCTL     = 0x00000040;
-     int ISIG        = 0x00000080;
-     int ICANON      = 0x00000100;
-     int ALTWERASE   = 0x00000200;
-     int IEXTEN      = 0x00000400;
-     int EXTPROC     = 0x00000800;
-     int TOSTOP      = 0x00400000;
-     int FLUSHO      = 0x00800000;
-     int NOKERNINFO  = 0x02000000;
-     int PENDIN      = 0x20000000;
-     int NOFLSH      = 0x80000000;
-
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibraryImpl.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibraryImpl.java
deleted file mode 100644
index da3099bb98471..0000000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibraryImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 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.internal.org.jline.terminal.impl.jna.osx;
-
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-public final class CLibraryImpl implements CLibrary {
-
-    static {
-        System.loadLibrary("le");
-        initIDs();
-    }
-
-    private static native void initIDs();
-
-    @Override
-    public native void tcgetattr(int fd, termios termios) throws LastErrorException;
-
-    @Override
-    public native void tcsetattr(int fd, int cmd, termios termios) throws LastErrorException;
-
-    @Override
-    public void ioctl(int fd, NativeLong cmd, winsize data) throws LastErrorException {
-        if (cmd.longValue() == CLibrary.TIOCGWINSZ || cmd.longValue() == CLibrary.TIOCSWINSZ) {
-            ioctl0(fd, cmd.longValue(), data);
-        } else {
-            throw new UnsupportedOperationException("Command: " + cmd + ", not supported.");
-        }
-    }
-
-    private native void ioctl0(int fd, long cmd, winsize data) throws LastErrorException;
-
-    @Override
-    public native int isatty(int fd);
-
-    @Override
-    public native void ttyname_r(int fd, byte[] buf, int len) throws LastErrorException;
-
-    @Override
-    public void openpty(int[] master, int[] slave, byte[] name, termios t, winsize s) throws LastErrorException {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/OsXNativePty.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/OsXNativePty.java
deleted file mode 100644
index 12aaff4f1f102..0000000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/OsXNativePty.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.osx;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-//import com.sun.jna.Native;
-//import com.sun.jna.NativeLong;
-//import com.sun.jna.Platform;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.JnaNativePty;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.TCSANOW;
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.TIOCGWINSZ;
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.TIOCSWINSZ;
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.termios;
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.winsize;
-
-public class OsXNativePty extends JnaNativePty {
-
-//    private static final CLibrary C_LIBRARY = Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
-    private static final CLibrary C_LIBRARY = new CLibraryImpl();//Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
-
-    public static OsXNativePty current(TerminalProvider.Stream consoleStream) throws IOException {
-        switch (consoleStream) {
-            case Output:
-                return new OsXNativePty(-1, null, 0, FileDescriptor.in, 1, FileDescriptor.out, ttyname(0));
-            case Error:
-                return new OsXNativePty(-1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
-            default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + consoleStream);
-        }
-    }
-
-    public static OsXNativePty open(Attributes attr, Size size) throws IOException {
-        int[] master = new int[1];
-        int[] slave = new int[1];
-        byte[] buf = new byte[64];
-        C_LIBRARY.openpty(master, slave, buf,
-                attr != null ? new termios(attr) : null,
-                size != null ? new winsize(size) : null);
-        int len = 0;
-        while (buf[len] != 0) {
-            len++;
-        }
-        String name = new String(buf, 0, len);
-        return new OsXNativePty(master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
-    }
-
-    public OsXNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, String name) {
-        super(master, masterFD, slave, slaveFD, name);
-    }
-
-    public OsXNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, int slaveOut, FileDescriptor slaveOutFD, String name) {
-        super(master, masterFD, slave, slaveFD, slaveOut, slaveOutFD, name);
-    }
-
-    @Override
-    public Attributes getAttr() throws IOException {
-        termios termios = new termios();
-        C_LIBRARY.tcgetattr(getSlave(), termios);
-        return termios.toAttributes();
-    }
-
-    @Override
-    protected void doSetAttr(Attributes attr) throws IOException {
-        termios termios = new termios(attr);
-        C_LIBRARY.tcsetattr(getSlave(), TCSANOW, termios);
-    }
-
-    @Override
-    public Size getSize() throws IOException {
-        winsize sz = new winsize();
-        C_LIBRARY.ioctl(getSlave(), new NativeLong(TIOCGWINSZ), sz);
-        return sz.toSize();
-    }
-
-    @Override
-    public void setSize(Size size) throws IOException {
-        winsize sz = new winsize(size);
-        C_LIBRARY.ioctl(getSlave(), new NativeLong(TIOCSWINSZ), sz);
-    }
-
-    public static int isatty(int fd) {
-        return C_LIBRARY.isatty(fd);
-    }
-
-    public static String ttyname(int fd) {
-        byte[] buf = new byte[64];
-        C_LIBRARY.ttyname_r(fd, buf, buf.length);
-        int len = 0;
-        while (buf[len] != 0) {
-            len++;
-        }
-        return new String(buf, 0, len);
-    }
-}
diff --git a/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp b/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp
deleted file mode 100644
index 3bc481f4afaa5..0000000000000
--- a/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-static jclass lastErrorExceptionClass;
-static jmethodID lastErrorExceptionConstructor;
-
-static jclass termios_j;
-static jfieldID c_iflag;
-static jfieldID c_oflag;
-static jfieldID c_cflag;
-static jfieldID c_lflag;
-static jfieldID c_cc;
-static jfieldID c_ispeed;
-static jfieldID c_ospeed;
-
-static jclass winsize_j;
-static jfieldID ws_row;
-static jfieldID ws_col;
-static jfieldID ws_xpixel;
-static jfieldID ws_ypixel;
-
-static jclass nativelong_j;
-static jfieldID nativelong_value;
-
-static void throw_errno(JNIEnv *env);
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_initIDs
-  (JNIEnv *env, jclass) {
-    jclass cls;
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/LastErrorException");
-    CHECK_NULL(cls);
-    lastErrorExceptionClass = (jclass) env->NewGlobalRef(cls);
-    lastErrorExceptionConstructor = env->GetMethodID(lastErrorExceptionClass, "<init>", "(J)V");
-    CHECK_NULL(lastErrorExceptionConstructor);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary$termios");
-    CHECK_NULL(cls);
-    termios_j = (jclass) env->NewGlobalRef(cls);
-    CHECK_NULL(termios_j);
-    c_iflag = env->GetFieldID(termios_j, "c_iflag", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_iflag);
-    c_oflag = env->GetFieldID(termios_j, "c_oflag", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_oflag);
-    c_cflag = env->GetFieldID(termios_j, "c_cflag", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_cflag);
-    c_lflag = env->GetFieldID(termios_j, "c_lflag", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_lflag);
-    c_cc = env->GetFieldID(termios_j, "c_cc", "[B");
-    CHECK_NULL(c_cc);
-    c_ispeed = env->GetFieldID(termios_j, "c_ispeed", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_ispeed);
-    c_ospeed = env->GetFieldID(termios_j, "c_ospeed", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_ospeed);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary$winsize");
-    CHECK_NULL(cls);
-    winsize_j = (jclass) env->NewGlobalRef(cls);
-    ws_row = env->GetFieldID(winsize_j, "ws_row", "S");
-    CHECK_NULL(ws_row);
-    ws_col = env->GetFieldID(winsize_j, "ws_col", "S");
-    CHECK_NULL(ws_col);
-    ws_xpixel= env->GetFieldID(winsize_j, "ws_xpixel", "S");
-    CHECK_NULL(ws_xpixel);
-    ws_ypixel= env->GetFieldID(winsize_j, "ws_ypixel", "S");
-    CHECK_NULL(ws_ypixel);
-
-    nativelong_j = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong");
-    CHECK_NULL(nativelong_j);
-    nativelong_value = env->GetFieldID(nativelong_j, "value", "J");
-    CHECK_NULL(nativelong_value);
-}
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_tcgetattr
-  (JNIEnv *env, jobject, jint fd, jobject result) {
-    termios data;
-
-    if (tcgetattr(fd, &data) != 0) {
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetLongField(env->GetObjectField(result, c_iflag), nativelong_value, data.c_iflag);
-    env->SetLongField(env->GetObjectField(result, c_oflag), nativelong_value, data.c_oflag);
-    env->SetLongField(env->GetObjectField(result, c_cflag), nativelong_value, data.c_cflag);
-    env->SetLongField(env->GetObjectField(result, c_lflag), nativelong_value, data.c_lflag);
-    jbyteArray c_ccValue = (jbyteArray) env->GetObjectField(result, c_cc);
-    env->SetByteArrayRegion(c_ccValue, 0, NCCS, (signed char *) data.c_cc);
-    env->SetLongField(env->GetObjectField(result, c_ispeed), nativelong_value, data.c_ispeed);
-    env->SetLongField(env->GetObjectField(result, c_ospeed), nativelong_value, data.c_ospeed);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl
- * Method:    tcsetattr
- * Signature: (IILjdk/internal/org/jline/terminal/impl/jna/osx/CLibrary/termios;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_tcsetattr
-  (JNIEnv *env, jobject, jint fd, jint cmd, jobject input) {
-    termios data;
-
-    data.c_iflag = env->GetLongField(env->GetObjectField(input, c_iflag), nativelong_value);
-    data.c_oflag = env->GetLongField(env->GetObjectField(input, c_oflag), nativelong_value);
-    data.c_cflag = env->GetLongField(env->GetObjectField(input, c_cflag), nativelong_value);
-    data.c_lflag = env->GetLongField(env->GetObjectField(input, c_lflag), nativelong_value);
-    jbyteArray c_ccValue = (jbyteArray) env->GetObjectField(input, c_cc);
-    env->GetByteArrayRegion(c_ccValue, 0, NCCS, (jbyte *) data.c_cc);
-    data.c_ispeed = env->GetLongField(env->GetObjectField(input, c_ispeed), nativelong_value);
-    data.c_ospeed = env->GetLongField(env->GetObjectField(input, c_ospeed), nativelong_value);
-
-    if (tcsetattr(fd, cmd, &data) != 0) {
-        throw_errno(env);
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl
- * Method:    ioctl0
- * Signature: (IILjdk/internal/org/jline/terminal/impl/jna/osx/CLibrary/winsize;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_ioctl0
-  (JNIEnv *env, jobject, jint fd, jlong cmd, jobject data) {
-    winsize ws;
-
-    ws.ws_row = env->GetShortField(data, ws_row);
-    ws.ws_col = env->GetShortField(data, ws_col);
-    ws.ws_xpixel = env->GetShortField(data, ws_xpixel);
-    ws.ws_ypixel = env->GetShortField(data, ws_ypixel);
-
-    if (ioctl(fd, cmd, &ws) != 0) {
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetShortField(data, ws_row, ws.ws_row);
-    env->SetShortField(data, ws_col, ws.ws_col);
-    env->SetShortField(data, ws_xpixel, ws.ws_xpixel);
-    env->SetShortField(data, ws_ypixel, ws.ws_ypixel);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl
- * Method:    isatty
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_isatty
-  (JNIEnv *, jobject, jint fd) {
-    return isatty(fd);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl
- * Method:    ttyname_r
- * Signature: (I[BI)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_ttyname_1r
-  (JNIEnv *env, jobject, jint fd, jbyteArray buf, jint len) {
-    char *data = new char[len];
-    int error = ttyname_r(fd, data, len);
-
-    if (error != 0) {
-        delete[] data;
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetByteArrayRegion(buf, 0, len, (jbyte *) data);
-    delete[] data;
-}
-
-/*
- * Throws LastErrorException based on the errno:
- */
-static void throw_errno(JNIEnv *env) {
-    jobject exc = env->NewObject(lastErrorExceptionClass,
-                                 lastErrorExceptionConstructor,
-                                 errno);
-    env->Throw((jthrowable) exc);
-}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index d876cffb377d9..64255b5ab6058 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -98,7 +98,7 @@ public JdkConsole printf(String format, Object ... args) {
         public String readLine(String fmt, Object ... args) {
             try {
                 initJLineIfNeeded();
-                return jline.readLine(fmt.formatted(args));
+                return jline.readLine(fmt.formatted(args).replace("%", "%%"));
             } catch (EndOfFileException eofe) {
                 return null;
             }
@@ -113,7 +113,8 @@ public String readLine() {
         public char[] readPassword(String fmt, Object ... args) {
             try {
                 initJLineIfNeeded();
-                return jline.readLine(fmt.formatted(args), '\0').toCharArray();
+                return jline.readLine(fmt.formatted(args).replace("%", "%%"), '\0')
+                            .toCharArray();
             } catch (EndOfFileException eofe) {
                 return null;
             } finally {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/BindingReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/BindingReader.java
index 46a45ae396d2b..74d3a46ecf2a7 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/BindingReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/BindingReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -66,7 +66,7 @@ public <T> T readBinding(KeyMap<T> keys, KeyMap<T> local, boolean block) {
         T o = null;
         int[] remaining = new int[1];
         boolean hasRead = false;
-        for (;;) {
+        for (; ; ) {
             if (local != null) {
                 o = local.getBound(opBuffer, remaining);
             }
@@ -78,8 +78,7 @@ public <T> T readBinding(KeyMap<T> keys, KeyMap<T> local, boolean block) {
                 if (remaining[0] >= 0) {
                     runMacro(opBuffer.substring(opBuffer.length() - remaining[0]));
                     opBuffer.setLength(opBuffer.length() - remaining[0]);
-                }
-                else {
+                } else {
                     long ambiguousTimeout = keys.getAmbiguousTimeout();
                     if (ambiguousTimeout > 0 && peekCharacter(ambiguousTimeout) != NonBlockingReader.READ_EXPIRED) {
                         o = null;
@@ -234,5 +233,4 @@ public String getCurrentBuffer() {
     public String getLastBinding() {
         return lastBinding;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/KeyMap.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/KeyMap.java
index 43c3a1b4fd124..a8a90ea5e0dcf 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/KeyMap.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/KeyMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,8 +8,6 @@
  */
 package jdk.internal.org.jline.keymap;
 
-import java.io.IOException;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -218,7 +216,6 @@ public static Collection<String> range(String range) {
         return seqs;
     }
 
-
     public static String esc() {
         return "\033";
     }
@@ -264,7 +261,6 @@ public static String key(Terminal terminal, Capability capability) {
     // Methods
     //
 
-
     public T getUnicode() {
         return unicode;
     }
@@ -306,9 +302,7 @@ private static <T> void doGetBoundKeys(KeyMap<T> keyMap, String prefix, Map<Stri
         }
         for (int c = 0; c < keyMap.mapping.length; c++) {
             if (keyMap.mapping[c] instanceof KeyMap) {
-                doGetBoundKeys((KeyMap<T>) keyMap.mapping[c],
-                        prefix + (char) (c),
-                        bound);
+                doGetBoundKeys((KeyMap<T>) keyMap.mapping[c], prefix + (char) (c), bound);
             } else if (keyMap.mapping[c] != null) {
                 bound.put(prefix + (char) (c), (T) keyMap.mapping[c]);
             }
@@ -456,5 +450,4 @@ private static <T> void bind(KeyMap<T> map, CharSequence keySeq, T function, boo
             }
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Binding.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Binding.java
index 0070b55c22df2..15e7a49a64318 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Binding.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Binding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,9 +14,8 @@
  * @see Macro
  * @see Reference
  * @see Widget
- * @see jdk.internal.org.jline.keymap.KeyMap
+ * @see org.jline.keymap.KeyMap
  *
  * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  */
-public interface Binding {
-}
+public interface Binding {}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Buffer.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Buffer.java
index c47746f566c39..8d65891d9d900 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Buffer.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Buffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -84,8 +84,8 @@ public interface Buffer {
 
     void copyFrom(Buffer buffer);
 
-    // JDK specific modification
-    default void zeroOut() {
-        throw new UnsupportedOperationException();
-    }
+    /**
+     * Clear any internal buffer.
+     */
+    void zeroOut();
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Candidate.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Candidate.java
index 0e95538492d40..e28e72ffb2322 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Candidate.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Candidate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -47,7 +47,15 @@ public Candidate(String value) {
      * @param complete the complete flag
      * @param sort the sort flag
      */
-    public Candidate(String value, String displ, String group, String descr, String suffix, String key, boolean complete, int sort) {
+    public Candidate(
+            String value,
+            String displ,
+            String group,
+            String descr,
+            String suffix,
+            String key,
+            boolean complete,
+            int sort) {
         this.value = Objects.requireNonNull(value);
         this.displ = Objects.requireNonNull(displ);
         this.group = group;
@@ -69,7 +77,8 @@ public Candidate(String value, String displ, String group, String descr, String
      * @param key the key
      * @param complete the complete flag
      */
-    public Candidate(String value, String displ, String group, String descr, String suffix, String key, boolean complete) {
+    public Candidate(
+            String value, String displ, String group, String descr, String suffix, String key, boolean complete) {
         this(value, displ, group, descr, suffix, key, complete, 0);
     }
 
@@ -159,11 +168,10 @@ public int sort() {
         return sort;
     }
 
-
     @Override
     public int compareTo(Candidate o) {
         // If both candidates have same sort, use default behavior
-        if( sort == o.sort() ) {
+        if (sort == o.sort()) {
             return value.compareTo(o.value);
         } else {
             return Integer.compare(sort, o.sort());
@@ -180,7 +188,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(value);
+        return Objects.hashCode(value);
     }
 
     @Override
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Completer.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Completer.java
index b87db7afbf02c..7a5937460d87c 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Completer.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Completer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,8 +18,7 @@
  * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  * @since 2.3
  */
-public interface Completer
-{
+public interface Completer {
     /**
      * Populates <i>candidates</i> with a list of possible completions for the <i>command line</i>.
      *
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletingParsedLine.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletingParsedLine.java
index 52a36b838969e..93558001af16a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletingParsedLine.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletingParsedLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -10,7 +10,7 @@
 
 /**
  * An extension of {@link ParsedLine} that, being aware of the quoting and escaping rules
- * of the {@link jdk.internal.org.jline.reader.Parser} that produced it, knows if and how a completion candidate
+ * of the {@link org.jline.reader.Parser} that produced it, knows if and how a completion candidate
  * should be escaped/quoted.
  *
  * @author Eric Bottard
@@ -22,5 +22,4 @@ public interface CompletingParsedLine extends ParsedLine {
     int rawWordCursor();
 
     int rawWordLength();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletionMatcher.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletionMatcher.java
index 58117c8f21333..4a2334642cad5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletionMatcher.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletionMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -23,8 +23,13 @@ public interface CompletionMatcher {
      * @param errors number of errors accepted in matching
      * @param originalGroupName value of JLineReader variable original-group-name
      */
-    void compile(Map<LineReader.Option, Boolean> options, boolean prefix, CompletingParsedLine line
-            , boolean caseInsensitive, int errors, String originalGroupName);
+    void compile(
+            Map<LineReader.Option, Boolean> options,
+            boolean prefix,
+            CompletingParsedLine line,
+            boolean caseInsensitive,
+            int errors,
+            String originalGroupName);
 
     /**
      *
@@ -44,5 +49,4 @@ void compile(Map<LineReader.Option, Boolean> options, boolean prefix, Completing
      * @return a common prefix of matched candidates
      */
     String getCommonPrefix();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EOFError.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EOFError.java
index 382db8bc49f2b..8a4f516174e17 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EOFError.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EOFError.java
@@ -1,20 +1,10 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Copyright (c) 2023, the original author(s).
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package jdk.internal.org.jline.reader;
 
@@ -45,7 +35,7 @@ public String getMissing() {
         return missing;
     }
 
-    public int getOpenBrackets(){
+    public int getOpenBrackets() {
         return openBrackets;
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Editor.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Editor.java
index e99706ed5d5ac..b2fadd3bd5213 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Editor.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Editor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,6 +13,8 @@
 
 public interface Editor {
     public void open(List<String> files) throws IOException;
+
     public void run() throws IOException;
+
     public void setRestricted(boolean restricted);
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EndOfFileException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EndOfFileException.java
index 9f70420d9dff0..1e50a7ea1ae55 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EndOfFileException.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EndOfFileException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -17,8 +17,7 @@ public class EndOfFileException extends RuntimeException {
     private static final long serialVersionUID = 528485360925144689L;
     private String partialLine;
 
-    public EndOfFileException() {
-    }
+    public EndOfFileException() {}
 
     public EndOfFileException(String message) {
         super(message);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Expander.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Expander.java
index 0562e92ed9604..614c89b3e6100 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Expander.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Expander.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,5 +13,4 @@ public interface Expander {
     String expandHistory(History history, String line);
 
     String expandVar(String word);
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Highlighter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Highlighter.java
index 136fb20324b89..dad62551ee062 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Highlighter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Highlighter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/History.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/History.java
index 7a669edddb5a3..0cb46a1ee9dfc 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/History.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/History.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,8 +21,7 @@
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public interface History extends Iterable<History.Entry>
-{
+public interface History extends Iterable<History.Entry> {
 
     /**
      * Initialize the history for the given reader.
@@ -75,7 +74,6 @@ public interface History extends Iterable<History.Entry>
      */
     void purge() throws IOException;
 
-
     int size();
 
     default boolean isEmpty() {
@@ -110,8 +108,7 @@ default boolean isPersistable(Entry entry) {
     // Entries
     //
 
-    interface Entry
-    {
+    interface Entry {
         int index();
 
         Instant time();
@@ -132,14 +129,17 @@ default Iterator<Entry> reverseIterator() {
     default Iterator<Entry> reverseIterator(int index) {
         return new Iterator<Entry>() {
             private final ListIterator<Entry> it = iterator(index + 1);
+
             @Override
             public boolean hasNext() {
                 return it.hasPrevious();
             }
+
             @Override
             public Entry next() {
                 return it.previous();
             }
+
             @Override
             public void remove() {
                 it.remove();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
index bc719e9b46a57..bc513f5f636a1 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2023, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,7 +21,7 @@
 
 /** Read lines from the console, with input editing.
  *
- * <h3>Thread safety</h3>
+ * <h2>Thread safety</h2>
  * The <code>LineReader</code> implementations are not thread safe,
  * thus you should not attempt to use a single reader in several threads.
  * Any attempt to call one of the <code>readLine</code> call while one is
@@ -31,7 +31,7 @@
  * {@link #printAbove(String)} or {@link #printAbove(AttributedString)} at
  * any time to allow text to be printed above the current prompt.
  *
- * <h3>Prompt strings</h3>
+ * <h2>Prompt strings</h2>
  * It is traditional for an interactive console-based program
  * to print a short prompt string to signal that the user is expected
  * to type a command.  JLine supports 3 kinds of prompt string:
@@ -81,7 +81,6 @@
  * </dd>
  * </dl>
  */
-
 public interface LineReader {
 
     /**
@@ -284,6 +283,7 @@ public interface LineReader {
     String MAIN = "main";
     String EMACS = "emacs";
     String SAFE = ".safe";
+    String DUMB = "dumb";
     String MENU = "menu";
 
     //
@@ -301,6 +301,7 @@ public interface LineReader {
      * they are displayed in a list below the field to be completed
      */
     String MENU_LIST_MAX = "menu-list-max";
+
     String DISABLE_HISTORY = "disable-history";
     String DISABLE_COMPLETION = "disable-completion";
     String EDITING_MODE = "editing-mode";
@@ -317,18 +318,23 @@ public interface LineReader {
     String ORIGINAL_GROUP_NAME = "ORIGINAL_GROUP_NAME";
     /** Completion style for displaying groups name */
     String COMPLETION_STYLE_GROUP = "COMPLETION_STYLE_GROUP";
+
     String COMPLETION_STYLE_LIST_GROUP = "COMPLETION_STYLE_LIST_GROUP";
     /** Completion style for displaying the current selected item */
     String COMPLETION_STYLE_SELECTION = "COMPLETION_STYLE_SELECTION";
+
     String COMPLETION_STYLE_LIST_SELECTION = "COMPLETION_STYLE_LIST_SELECTION";
     /** Completion style for displaying the candidate description */
     String COMPLETION_STYLE_DESCRIPTION = "COMPLETION_STYLE_DESCRIPTION";
+
     String COMPLETION_STYLE_LIST_DESCRIPTION = "COMPLETION_STYLE_LIST_DESCRIPTION";
     /** Completion style for displaying the matching part of candidates */
     String COMPLETION_STYLE_STARTING = "COMPLETION_STYLE_STARTING";
+
     String COMPLETION_STYLE_LIST_STARTING = "COMPLETION_STYLE_LIST_STARTING";
     /** Completion style for displaying the list */
     String COMPLETION_STYLE_BACKGROUND = "COMPLETION_STYLE_BACKGROUND";
+
     String COMPLETION_STYLE_LIST_BACKGROUND = "COMPLETION_STYLE_LIST_BACKGROUND";
     /**
      * Set the template for prompts for secondary (continuation) lines.
@@ -390,6 +396,26 @@ public interface LineReader {
      */
     String SUGGESTIONS_MIN_BUFFER_SIZE = "suggestions-min-buffer-size";
 
+    /**
+     * Max number of times a command can be repeated.
+     */
+    String MAX_REPEAT_COUNT = "max-repeat-count";
+
+    /**
+     * Number of spaces to display a tabulation, the default is 4.
+     */
+    String TAB_WIDTH = "tab-width";
+
+    /**
+     * Name of inputrc to read at line reader creation time.
+     */
+    String INPUT_RC_FILE_NAME = "input-rc-file-name";
+
+    /**
+     * Prefix to automatically delegate variables to system properties
+     */
+    String SYSTEM_PROPERTY_PREFIX = "system-property-prefix";
+
     Map<String, KeyMap<Binding>> defaultKeyMaps();
 
     enum Option {
@@ -469,8 +495,7 @@ enum Option {
         EMPTY_WORD_OPTIONS(true),
 
         /** Disable the undo feature */
-        DISABLE_UNDO
-        ;
+        DISABLE_UNDO;
 
         private final boolean def;
 
@@ -611,7 +636,8 @@ enum SuggestionType {
      * @throws EndOfFileException if an EOF has been found (using Ctrl-D for example)
      * @throws java.io.IOError in case of other i/o errors
      */
-    String readLine(String prompt, String rightPrompt, Character mask, String buffer) throws UserInterruptException, EndOfFileException;
+    String readLine(String prompt, String rightPrompt, Character mask, String buffer)
+            throws UserInterruptException, EndOfFileException;
 
     /**
      * Read a line from the <i>in</i> {@link InputStream}, and return the line
@@ -631,7 +657,8 @@ enum SuggestionType {
      * @throws EndOfFileException if an EOF has been found (using Ctrl-D for example)
      * @throws java.io.IOError in case of other i/o errors
      */
-    String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallback, String buffer) throws UserInterruptException, EndOfFileException;
+    String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallback, String buffer)
+            throws UserInterruptException, EndOfFileException;
 
     /**
      * Prints a line above the prompt and redraw everything.
@@ -702,7 +729,7 @@ enum SuggestionType {
     void runMacro(String macro);
 
     /**
-     * Read a mouse event when the {@link jdk.internal.org.jline.utils.InfoCmp.Capability#key_mouse} sequence
+     * Read a mouse event when the {@link org.jline.utils.InfoCmp.Capability#key_mouse} sequence
      * has just been read on the input stream.
      * Compared to {@link Terminal#readMouseEvent()}, this method takes into account keys
      * that have been pushed back using {@link #runMacro(String)}.
@@ -751,8 +778,8 @@ enum SuggestionType {
 
     SuggestionType getAutosuggestion();
 
-    // JDK specific modification
-    default void zeroOut() {
-        throw new UnsupportedOperationException();
-    }
+    /**
+     * Clear any internal buffers.
+     */
+    void zeroOut();
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReaderBuilder.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReaderBuilder.java
index 14d5a0e8b1c3a..942bba3605d52 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReaderBuilder.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReaderBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -38,8 +38,7 @@ public static LineReaderBuilder builder() {
     Expander expander;
     CompletionMatcher completionMatcher;
 
-    private LineReaderBuilder() {
-    }
+    private LineReaderBuilder() {}
 
     public LineReaderBuilder terminal(Terminal terminal) {
         this.terminal = terminal;
@@ -88,8 +87,9 @@ public LineReaderBuilder parser(Parser parser) {
             try {
                 if (!Boolean.getBoolean(LineReader.PROP_SUPPORT_PARSEDLINE)
                         && !(parser.parse("", 0) instanceof CompletingParsedLine)) {
-                    Log.warn("The Parser of class " + parser.getClass().getName() + " does not support the CompletingParsedLine interface. " +
-                            "Completion with escaped or quoted words won't work correctly.");
+                    Log.warn("The Parser of class " + parser.getClass().getName()
+                            + " does not support the CompletingParsedLine interface. "
+                            + "Completion with escaped or quoted words won't work correctly.");
                 }
             } catch (Throwable t) {
                 // Ignore
@@ -153,5 +153,4 @@ public LineReader build() {
         }
         return reader;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Macro.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Macro.java
index e66efcc5f9281..b00769aff52f5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Macro.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Macro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -35,7 +35,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "Macro[" +
-                sequence + ']';
+        return "Macro[" + sequence + ']';
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/MaskingCallback.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/MaskingCallback.java
index 03501aaf07c6a..3b624e306f28a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/MaskingCallback.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/MaskingCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -31,5 +31,4 @@ public interface MaskingCallback {
      * @return the modified line
      */
     String history(String line);
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/ParsedLine.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/ParsedLine.java
index 683c4b48d776e..3d87e6b80b2eb 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/ParsedLine.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/ParsedLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -64,5 +64,4 @@ public interface ParsedLine {
      * @return the cursor position within the line
      */
     int cursor();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Parser.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Parser.java
index 1f7df67d5739b..5db53818f67db 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Parser.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -35,7 +35,7 @@ default boolean validVariableName(String name) {
 
     default String getCommand(final String line) {
         String out;
-        Pattern  patternCommand = Pattern.compile("^\\s*" + REGEX_VARIABLE + "=(" + REGEX_COMMAND + ")(\\s+|$)");
+        Pattern patternCommand = Pattern.compile("^\\s*" + REGEX_VARIABLE + "=(" + REGEX_COMMAND + ")(\\s+|$)");
         Matcher matcher = patternCommand.matcher(line);
         if (matcher.find()) {
             out = matcher.group(1);
@@ -50,7 +50,7 @@ default String getCommand(final String line) {
 
     default String getVariable(final String line) {
         String out = null;
-        Pattern  patternCommand = Pattern.compile("^\\s*(" + REGEX_VARIABLE + ")\\s*=[^=~].*");
+        Pattern patternCommand = Pattern.compile("^\\s*(" + REGEX_VARIABLE + ")\\s*=[^=~].*");
         Matcher matcher = patternCommand.matcher(line);
         if (matcher.find()) {
             out = matcher.group(1);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/PrintAboveWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/PrintAboveWriter.java
index 63c9decd19444..e23988310a593 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/PrintAboveWriter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/PrintAboveWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Reference.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Reference.java
index f799a3da22070..2fb1aaa671b0a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Reference.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Reference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -38,7 +38,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "Reference[" +
-                name + ']';
+        return "Reference[" + name + ']';
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/SyntaxError.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/SyntaxError.java
index e46143e4c3998..eaf3e1d758064 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/SyntaxError.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/SyntaxError.java
@@ -1,20 +1,10 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Copyright (c) 2023, the original author(s).
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package jdk.internal.org.jline.reader;
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
index b5510cab5c918..68bec8041faa5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,23 +14,19 @@
  * interrupt character (ctrl-C). The partially entered line is
  * available via the {@link #getPartialLine()} method.
  */
-public class UserInterruptException
-    extends RuntimeException
-{
+public class UserInterruptException extends RuntimeException {
     private static final long serialVersionUID = 6172232572140736750L;
 
     private final String partialLine;
 
-    public UserInterruptException(String partialLine)
-    {
+    public UserInterruptException(String partialLine) {
         this.partialLine = partialLine;
     }
 
     /**
      * @return the partially entered line when ctrl-C was pressed
      */
-    public String getPartialLine()
-    {
+    public String getPartialLine() {
         return partialLine;
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Widget.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Widget.java
index d5add7fb1a7df..ae831c5eaadc6 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Widget.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Widget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -15,5 +15,4 @@
 public interface Widget extends Binding {
 
     boolean apply();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/BufferImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/BufferImpl.java
index d0c4c2cb7ae07..a6295dbb487f4 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/BufferImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/BufferImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -20,8 +20,7 @@
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.0
  */
-public class BufferImpl implements Buffer
-{
+public class BufferImpl implements Buffer {
     private int cursor = 0;
     private int cursorCol = -1;
     private int[] buffer;
@@ -46,7 +45,7 @@ private BufferImpl(BufferImpl buffer) {
         this.g1 = buffer.g1;
     }
 
-    public BufferImpl copy () {
+    public BufferImpl copy() {
         return new BufferImpl(this);
     }
 
@@ -107,7 +106,7 @@ private int adjust(int i) {
      * @param c the character to insert
      */
     public void write(int c) {
-        write(new int[] { c });
+        write(new int[] {c});
     }
 
     /**
@@ -121,7 +120,7 @@ public void write(int c, boolean overTyping) {
         if (overTyping) {
             delete(1);
         }
-        write(new int[] { c });
+        write(new int[] {c});
     }
 
     /**
@@ -224,8 +223,7 @@ public int move(final int num) {
 
         if ((cursor + where) < 0) {
             where = -cursor;
-        }
-        else if ((cursor + where) > length()) {
+        } else if ((cursor + where) > length()) {
             where = length() - cursor;
         }
 
@@ -371,7 +369,6 @@ private void moveGapToCursor() {
         }
     }
 
-    // JDK specific modification
     @Override
     public void zeroOut() {
         Arrays.fill(buffer, 0);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/CompletionMatcherImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/CompletionMatcherImpl.java
index f829f13d51b2c..761ee1815c3d0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/CompletionMatcherImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/CompletionMatcherImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,26 +8,25 @@
  */
 package jdk.internal.org.jline.reader.impl;
 
-import jdk.internal.org.jline.reader.Candidate;
-import jdk.internal.org.jline.reader.CompletingParsedLine;
-import jdk.internal.org.jline.reader.CompletionMatcher;
-import jdk.internal.org.jline.reader.LineReader;
-import jdk.internal.org.jline.utils.AttributedString;
-
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import jdk.internal.org.jline.reader.Candidate;
+import jdk.internal.org.jline.reader.CompletingParsedLine;
+import jdk.internal.org.jline.reader.CompletionMatcher;
+import jdk.internal.org.jline.reader.LineReader;
+import jdk.internal.org.jline.utils.AttributedString;
+
 public class CompletionMatcherImpl implements CompletionMatcher {
     protected Predicate<String> exact;
     protected List<Function<Map<String, List<Candidate>>, Map<String, List<Candidate>>>> matchers;
     private Map<String, List<Candidate>> matching;
     private boolean caseInsensitive;
 
-    public CompletionMatcherImpl() {
-    }
+    public CompletionMatcherImpl() {}
 
     protected void reset(boolean caseInsensitive) {
         this.caseInsensitive = caseInsensitive;
@@ -37,8 +36,13 @@ protected void reset(boolean caseInsensitive) {
     }
 
     @Override
-    public void compile(Map<LineReader.Option, Boolean> options, boolean prefix, CompletingParsedLine line
-            , boolean caseInsensitive, int errors, String originalGroupName) {
+    public void compile(
+            Map<LineReader.Option, Boolean> options,
+            boolean prefix,
+            CompletingParsedLine line,
+            boolean caseInsensitive,
+            int errors,
+            String originalGroupName) {
         reset(caseInsensitive);
         defaultMatchers(options, prefix, line, caseInsensitive, errors, originalGroupName);
     }
@@ -47,15 +51,18 @@ public void compile(Map<LineReader.Option, Boolean> options, boolean prefix, Com
     public List<Candidate> matches(List<Candidate> candidates) {
         matching = Collections.emptyMap();
         Map<String, List<Candidate>> sortedCandidates = sort(candidates);
-        for (Function<Map<String, List<Candidate>>,
-                Map<String, List<Candidate>>> matcher : matchers) {
+        for (Function<Map<String, List<Candidate>>, Map<String, List<Candidate>>> matcher : matchers) {
             matching = matcher.apply(sortedCandidates);
             if (!matching.isEmpty()) {
                 break;
             }
         }
-        return !matching.isEmpty() ? matching.entrySet().stream().flatMap(e -> e.getValue().stream()).distinct().collect(Collectors.toList())
-                                   : new ArrayList<>();
+        return !matching.isEmpty()
+                ? matching.entrySet().stream()
+                        .flatMap(e -> e.getValue().stream())
+                        .distinct()
+                        .collect(Collectors.toList())
+                : new ArrayList<>();
     }
 
     @Override
@@ -63,10 +70,12 @@ public Candidate exactMatch() {
         if (matching == null) {
             throw new IllegalStateException();
         }
-        return matching.values().stream().flatMap(Collection::stream)
+        return matching.values().stream()
+                .flatMap(Collection::stream)
                 .filter(Candidate::complete)
                 .filter(c -> exact.test(c.value()))
-                .findFirst().orElse(null);
+                .findFirst()
+                .orElse(null);
     }
 
     @Override
@@ -84,8 +93,13 @@ public String getCommonPrefix() {
     /**
      * Default JLine matchers
      */
-    protected void defaultMatchers(Map<LineReader.Option, Boolean> options, boolean prefix, CompletingParsedLine line
-            , boolean caseInsensitive, int errors, String originalGroupName) {
+    protected void defaultMatchers(
+            Map<LineReader.Option, Boolean> options,
+            boolean prefix,
+            CompletingParsedLine line,
+            boolean caseInsensitive,
+            int errors,
+            String originalGroupName) {
         // Find matchers
         // TODO: glob completion
         String wd = line.word();
@@ -94,8 +108,7 @@ protected void defaultMatchers(Map<LineReader.Option, Boolean> options, boolean
         if (prefix) {
             matchers = new ArrayList<>(Arrays.asList(
                     simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).startsWith(wp)),
-                    simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).contains(wp))
-            ));
+                    simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).contains(wp))));
             if (LineReader.Option.COMPLETE_MATCHER_TYPO.isSet(options)) {
                 matchers.add(typoMatcher(wp, errors, caseInsensitive, originalGroupName));
             }
@@ -109,14 +122,14 @@ protected void defaultMatchers(Map<LineReader.Option, Boolean> options, boolean
                 Pattern p1 = Pattern.compile(Pattern.quote(wp) + ".*" + Pattern.quote(ws) + ".*");
                 Pattern p2 = Pattern.compile(".*" + Pattern.quote(wp) + ".*" + Pattern.quote(ws) + ".*");
                 matchers = new ArrayList<>(Arrays.asList(
-                        simpleMatcher(s -> p1.matcher(caseInsensitive ? s.toLowerCase() : s).matches()),
-                        simpleMatcher(s -> p2.matcher(caseInsensitive ? s.toLowerCase() : s).matches())
-                ));
+                        simpleMatcher(s -> p1.matcher(caseInsensitive ? s.toLowerCase() : s)
+                                .matches()),
+                        simpleMatcher(s -> p2.matcher(caseInsensitive ? s.toLowerCase() : s)
+                                .matches())));
             } else {
                 matchers = new ArrayList<>(Arrays.asList(
                         simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).startsWith(wdi)),
-                        simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).contains(wdi))
-                ));
+                        simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).contains(wdi))));
             }
             if (LineReader.Option.COMPLETE_MATCHER_CAMELCASE.isSet(options)) {
                 matchers.add(simpleMatcher(s -> camelMatch(wd, 0, s, 0)));
@@ -128,18 +141,20 @@ protected void defaultMatchers(Map<LineReader.Option, Boolean> options, boolean
         }
     }
 
-    protected Function<Map<String, List<Candidate>>,
-            Map<String, List<Candidate>>> simpleMatcher(Predicate<String> predicate) {
+    protected Function<Map<String, List<Candidate>>, Map<String, List<Candidate>>> simpleMatcher(
+            Predicate<String> predicate) {
         return m -> m.entrySet().stream()
                 .filter(e -> predicate.test(e.getKey()))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
-    protected Function<Map<String, List<Candidate>>,
-            Map<String, List<Candidate>>> typoMatcher(String word, int errors, boolean caseInsensitive, String originalGroupName) {
+    protected Function<Map<String, List<Candidate>>, Map<String, List<Candidate>>> typoMatcher(
+            String word, int errors, boolean caseInsensitive, String originalGroupName) {
         return m -> {
             Map<String, List<Candidate>> map = m.entrySet().stream()
-                    .filter(e -> ReaderUtils.distance(word, caseInsensitive ? e.getKey().toLowerCase() : e.getKey()) < errors)
+                    .filter(e -> ReaderUtils.distance(
+                                    word, caseInsensitive ? e.getKey().toLowerCase() : e.getKey())
+                            < errors)
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
             if (map.size() > 1) {
                 map.computeIfAbsent(word, w -> new ArrayList<>())
@@ -178,7 +193,8 @@ private Map<String, List<Candidate>> sort(List<Candidate> candidates) {
         Map<String, List<Candidate>> sortedCandidates = new HashMap<>();
         for (Candidate candidate : candidates) {
             sortedCandidates
-                    .computeIfAbsent(AttributedString.fromAnsi(candidate.value()).toString(), s -> new ArrayList<>())
+                    .computeIfAbsent(
+                            AttributedString.fromAnsi(candidate.value()).toString(), s -> new ArrayList<>())
                     .add(candidate);
         }
         return sortedCandidates;
@@ -206,5 +222,4 @@ private String getCommonStart(String str1, String str2, boolean caseInsensitive)
         }
         return new String(s1, 0, len);
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultExpander.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultExpander.java
index b534b96ff2f04..e5e7735a38479 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultExpander.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultExpander.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -32,27 +32,25 @@ public String expandHistory(History history, String line) {
             if (unicode > 0) {
                 escaped = (--unicode >= 0);
                 sb.append(c);
-            }
-            else if (escaped) {
+            } else if (escaped) {
                 if (c == 'u') {
                     unicode = 4;
                 } else {
                     escaped = false;
                 }
                 sb.append(c);
-            }
-            else if (c == '\'') {
+            } else if (c == '\'') {
                 inQuote = !inQuote;
                 sb.append(c);
-            }
-            else if (inQuote) {
+            } else if (inQuote) {
                 sb.append(c);
-            }
-            else {
+            } else {
                 switch (c) {
                     case '\\':
-                        // any '\!' should be considered an expansion escape, so skip expansion and strip the escape character
-                        // a leading '\^' should be considered an expansion escape, so skip expansion and strip the escape character
+                        // any '\!' should be considered an expansion escape, so skip expansion and strip the escape
+                        // character
+                        // a leading '\^' should be considered an expansion escape, so skip expansion and strip the
+                        // escape character
                         // otherwise, add the escape
                         escaped = true;
                         sb.append(c);
@@ -91,7 +89,8 @@ else if (inQuote) {
                                     if (history.size() == 0) {
                                         throw new IllegalArgumentException("!$: event not found");
                                     }
-                                    String previous = history.get(history.index() - 1).trim();
+                                    String previous =
+                                            history.get(history.index() - 1).trim();
                                     int lastSpace = previous.lastIndexOf(' ');
                                     if (lastSpace != -1) {
                                         rep = previous.substring(lastSpace + 1);
@@ -128,14 +127,18 @@ else if (inQuote) {
                                     try {
                                         idx = Integer.parseInt(line.substring(i1, i));
                                     } catch (NumberFormatException e) {
-                                        throw new IllegalArgumentException((neg ? "!-" : "!") + line.substring(i1, i) + ": event not found");
+                                        throw new IllegalArgumentException(
+                                                (neg ? "!-" : "!") + line.substring(i1, i) + ": event not found");
                                     }
                                     if (neg && idx > 0 && idx <= history.size()) {
                                         rep = history.get(history.index() - idx);
-                                    } else if (!neg && idx > history.index() - history.size() && idx <= history.index()) {
+                                    } else if (!neg
+                                            && idx > history.index() - history.size()
+                                            && idx <= history.index()) {
                                         rep = history.get(idx - 1);
                                     } else {
-                                        throw new IllegalArgumentException((neg ? "!-" : "!") + line.substring(i1, i) + ": event not found");
+                                        throw new IllegalArgumentException(
+                                                (neg ? "!-" : "!") + line.substring(i1, i) + ": event not found");
                                     }
                                     break;
                                 default:
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
index ac286ad734f26..55d39efde27da 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -10,9 +10,9 @@
 
 import java.util.regex.Pattern;
 
+import jdk.internal.org.jline.reader.Highlighter;
 import jdk.internal.org.jline.reader.LineReader;
 import jdk.internal.org.jline.reader.LineReader.RegionType;
-import jdk.internal.org.jline.reader.Highlighter;
 import jdk.internal.org.jline.utils.AttributedString;
 import jdk.internal.org.jline.utils.AttributedStringBuilder;
 import jdk.internal.org.jline.utils.AttributedStyle;
@@ -57,7 +57,8 @@ public AttributedString highlight(LineReader reader, String buffer) {
                 while (negativeStart > 0 && reader.getBuffer().atChar(negativeStart - 1) != '\n') {
                     negativeStart--;
                 }
-                while (negativeEnd < reader.getBuffer().length() - 1 && reader.getBuffer().atChar(negativeEnd + 1) != '\n') {
+                while (negativeEnd < reader.getBuffer().length() - 1
+                        && reader.getBuffer().atChar(negativeEnd + 1) != '\n') {
                     negativeEnd++;
                 }
             }
@@ -104,5 +105,4 @@ public AttributedString highlight(LineReader reader, String buffer) {
         }
         return sb.toAttributedString();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultParser.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultParser.java
index d9b3a9948d505..26cdf6abc51af 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultParser.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,18 +21,18 @@
 public class DefaultParser implements Parser {
 
     public enum Bracket {
-        ROUND,   // ()
-        CURLY,   // {}
-        SQUARE,  // []
-        ANGLE    // <>
+        ROUND, // ()
+        CURLY, // {}
+        SQUARE, // []
+        ANGLE // <>
     }
 
     public static class BlockCommentDelims {
         private final String start;
         private final String end;
+
         public BlockCommentDelims(String start, String end) {
-            if (start == null || end == null
-              || start.isEmpty() || end.isEmpty() || start.equals(end)) {
+            if (start == null || end == null || start.isEmpty() || end.isEmpty() || start.equals(end)) {
                 throw new IllegalArgumentException("Bad block comment delimiter!");
             }
             this.start = start;
@@ -185,22 +185,22 @@ public void setEofOnUnclosedBracket(Bracket... brackets) {
             int i = 0;
             for (Bracket b : bs) {
                 switch (b) {
-                case ROUND:
-                    openingBrackets[i] = '(';
-                    closingBrackets[i] = ')';
-                    break;
-                case CURLY:
-                    openingBrackets[i] = '{';
-                    closingBrackets[i] = '}';
-                    break;
-                case SQUARE:
-                    openingBrackets[i] = '[';
-                    closingBrackets[i] = ']';
-                    break;
-                case ANGLE:
-                    openingBrackets[i] = '<';
-                    closingBrackets[i] = '>';
-                    break;
+                    case ROUND:
+                        openingBrackets[i] = '(';
+                        closingBrackets[i] = ')';
+                        break;
+                    case CURLY:
+                        openingBrackets[i] = '{';
+                        closingBrackets[i] = '}';
+                        break;
+                    case SQUARE:
+                        openingBrackets[i] = '[';
+                        closingBrackets[i] = ']';
+                        break;
+                    case ANGLE:
+                        openingBrackets[i] = '<';
+                        closingBrackets[i] = '>';
+                        break;
                 }
                 i++;
             }
@@ -229,7 +229,6 @@ public boolean validVariableName(String name) {
         return name != null && regexVariable != null && name.matches(regexVariable);
     }
 
-
     @Override
     public String getCommand(final String line) {
         String out = "";
@@ -296,7 +295,7 @@ public ParsedLine parse(final String line, final int cursor, ParseContext contex
             if (quoteStart < 0 && isQuoteChar(line, i) && !lineCommented && !blockCommented) {
                 // Start a quote block
                 quoteStart = i;
-                if (current.length()==0) {
+                if (current.length() == 0) {
                     quotedWord = true;
                     if (context == ParseContext.SPLIT_LINE) {
                         current.append(line.charAt(i));
@@ -324,13 +323,15 @@ public ParsedLine parse(final String line, final int cursor, ParseContext contex
                     }
                 } else {
                     // Delimiter
-                    rawWordLength = handleDelimiterAndGetRawWordLength(current, words, rawWordStart, rawWordCursor, rawWordLength, i);
+                    rawWordLength = handleDelimiterAndGetRawWordLength(
+                            current, words, rawWordStart, rawWordCursor, rawWordLength, i);
                     rawWordStart = i + 1;
                 }
             } else {
                 if (quoteStart < 0 && !blockCommented && (lineCommented || isLineCommentStarted(line, i))) {
                     lineCommented = true;
-                } else if (quoteStart < 0 && !lineCommented
+                } else if (quoteStart < 0
+                        && !lineCommented
                         && (blockCommented || isCommentDelim(line, i, blockCommentStart))) {
                     if (blockCommented) {
                         if (blockCommentEnd != null && isCommentDelim(line, i, blockCommentEnd)) {
@@ -339,12 +340,12 @@ public ParsedLine parse(final String line, final int cursor, ParseContext contex
                         }
                     } else {
                         blockCommented = true;
-                        rawWordLength = handleDelimiterAndGetRawWordLength(current, words, rawWordStart, rawWordCursor, rawWordLength, i);
+                        rawWordLength = handleDelimiterAndGetRawWordLength(
+                                current, words, rawWordStart, rawWordCursor, rawWordLength, i);
                         i += blockCommentStart == null ? 0 : blockCommentStart.length() - 1;
                         rawWordStart = i + 1;
                     }
-                } else if (quoteStart < 0 && !lineCommented
-                        && isCommentDelim(line, i, blockCommentEnd)) {
+                } else if (quoteStart < 0 && !lineCommented && isCommentDelim(line, i, blockCommentEnd)) {
                     current.append(line.charAt(i));
                     blockCommentInRightOrder = false;
                 } else if (!isEscapeChar(line, i)) {
@@ -377,16 +378,14 @@ && isCommentDelim(line, i, blockCommentEnd)) {
                 throw new EOFError(-1, -1, "Escaped new line", "newline");
             }
             if (eofOnUnclosedQuote && quoteStart >= 0) {
-                throw new EOFError(-1, -1, "Missing closing quote", line.charAt(quoteStart) == '\''
-                        ? "quote" : "dquote");
+                throw new EOFError(
+                        -1, -1, "Missing closing quote", line.charAt(quoteStart) == '\'' ? "quote" : "dquote");
             }
             if (blockCommented) {
-                throw new EOFError(-1, -1, "Missing closing block comment delimiter",
-                        "add: " + blockCommentEnd);
+                throw new EOFError(-1, -1, "Missing closing block comment delimiter", "add: " + blockCommentEnd);
             }
             if (!blockCommentInRightOrder) {
-                throw new EOFError(-1, -1, "Missing opening block comment delimiter",
-                        "missing: " + blockCommentStart);
+                throw new EOFError(-1, -1, "Missing opening block comment delimiter", "missing: " + blockCommentStart);
             }
             if (bracketChecker.isClosingBracketMissing() || bracketChecker.isOpeningBracketMissing()) {
                 String message = null;
@@ -398,8 +397,13 @@ && isCommentDelim(line, i, blockCommentEnd)) {
                     message = "Missing opening bracket";
                     missing = "missing: " + bracketChecker.getMissingOpeningBracket();
                 }
-                throw new EOFError(-1, -1, message, missing,
-                        bracketChecker.getOpenBrackets(), bracketChecker.getNextClosingBracket());
+                throw new EOFError(
+                        -1,
+                        -1,
+                        message,
+                        missing,
+                        bracketChecker.getOpenBrackets(),
+                        bracketChecker.getNextClosingBracket());
             }
         }
 
@@ -420,7 +424,13 @@ public boolean isDelimiter(final CharSequence buffer, final int pos) {
         return !isQuoted(buffer, pos) && !isEscaped(buffer, pos) && isDelimiterChar(buffer, pos);
     }
 
-    private int handleDelimiterAndGetRawWordLength(StringBuilder current, List<String> words, int rawWordStart, int rawWordCursor, int rawWordLength, int pos) {
+    private int handleDelimiterAndGetRawWordLength(
+            StringBuilder current,
+            List<String> words,
+            int rawWordStart,
+            int rawWordCursor,
+            int rawWordLength,
+            int pos) {
         if (current.length() > 0) {
             words.add(current.toString());
             current.setLength(0); // reset the arg
@@ -470,7 +480,7 @@ private boolean isCommentDelim(final CharSequence buffer, final int pos, final S
 
     public boolean isLineCommentStarted(final CharSequence buffer, final int pos) {
         if (lineCommentDelims != null) {
-            for (String comment: lineCommentDelims) {
+            for (String comment : lineCommentDelims) {
                 if (isCommentDelim(buffer, pos, comment)) {
                     return true;
                 }
@@ -584,8 +594,8 @@ public void check(final CharSequence buffer, final int pos) {
             } else {
                 bid = bracketId(closingBrackets, buffer, pos);
                 if (bid >= 0) {
-                    if (!nested.isEmpty() && bid == nested.get(nested.size()-1)) {
-                        nested.remove(nested.size()-1);
+                    if (!nested.isEmpty() && bid == nested.get(nested.size() - 1)) {
+                        nested.remove(nested.size() - 1);
                     } else {
                         missingOpeningBracket = bid;
                     }
@@ -634,7 +644,7 @@ public String getNextClosingBracket() {
         }
 
         private int bracketId(final char[] brackets, final CharSequence buffer, final int pos) {
-            for (int i=0; i < brackets.length; i++) {
+            for (int i = 0; i < brackets.length; i++) {
                 if (buffer.charAt(pos) == brackets[i]) {
                     return i;
                 }
@@ -648,8 +658,7 @@ private int bracketId(final char[] brackets, final CharSequence buffer, final in
      *
      * @author <a href="mailto:mwp1@cornell.edu">Marc Prud'hommeaux</a>
      */
-    public class ArgumentList implements ParsedLine, CompletingParsedLine
-    {
+    public class ArgumentList implements ParsedLine, CompletingParsedLine {
         private final String line;
 
         private final List<String> words;
@@ -667,11 +676,21 @@ public class ArgumentList implements ParsedLine, CompletingParsedLine
         private final int rawWordLength;
 
         @Deprecated
-        public ArgumentList(final String line, final List<String> words,
-                            final int wordIndex, final int wordCursor,
-                            final int cursor) {
-            this(line, words, wordIndex, wordCursor, cursor,
-                    null, wordCursor, words.get(wordIndex).length());
+        public ArgumentList(
+                final String line,
+                final List<String> words,
+                final int wordIndex,
+                final int wordCursor,
+                final int cursor) {
+            this(
+                    line,
+                    words,
+                    wordIndex,
+                    wordCursor,
+                    cursor,
+                    null,
+                    wordCursor,
+                    words.get(wordIndex).length());
         }
 
         /**
@@ -685,10 +704,15 @@ public ArgumentList(final String line, final List<String> words,
          * @param rawWordCursor the cursor position inside the raw word (i.e. including quotes and escape characters)
          * @param rawWordLength the raw word length, including quotes and escape characters
          */
-        public ArgumentList(final String line, final List<String> words,
-                            final int wordIndex, final int wordCursor,
-                            final int cursor, final String openingQuote,
-                            final int rawWordCursor, final int rawWordLength) {
+        public ArgumentList(
+                final String line,
+                final List<String> words,
+                final int wordIndex,
+                final int wordCursor,
+                final int cursor,
+                final String openingQuote,
+                final int rawWordCursor,
+                final int rawWordLength) {
             this.line = line;
             this.words = Collections.unmodifiableList(Objects.requireNonNull(words));
             this.wordIndex = wordIndex;
@@ -732,8 +756,8 @@ public CharSequence escape(CharSequence candidate, boolean complete) {
             Predicate<Integer> needToBeEscaped;
             String quote = openingQuote;
             boolean middleQuotes = false;
-            if (openingQuote==null) {
-                for (int i=0; i < sb.length(); i++) {
+            if (openingQuote == null) {
+                for (int i = 0; i < sb.length(); i++) {
                     if (isQuoteChar(sb, i)) {
                         middleQuotes = true;
                         break;
@@ -746,7 +770,8 @@ public CharSequence escape(CharSequence candidate, boolean complete) {
                     // Delimiters (spaces) don't need to be escaped, nor do other quotes, but everything else does.
                     // Also, close the quote at the end
                     if (openingQuote != null) {
-                        needToBeEscaped = i -> isRawEscapeChar(sb.charAt(i)) || String.valueOf(sb.charAt(i)).equals(openingQuote);
+                        needToBeEscaped = i -> isRawEscapeChar(sb.charAt(i))
+                                || String.valueOf(sb.charAt(i)).equals(openingQuote);
                     }
                     // Completion is protected by middle quotes:
                     // Delimiters (spaces) don't need to be escaped, nor do quotes, but everything else does.
@@ -756,8 +781,8 @@ else if (middleQuotes) {
                     // No quote protection, need to escape everything: delimiter chars (spaces), quote chars
                     // and escapes themselves
                     else {
-                        needToBeEscaped = i -> isDelimiterChar(sb, i) || isRawEscapeChar(sb.charAt(i))
-                                || isRawQuoteChar(sb.charAt(i));
+                        needToBeEscaped = i ->
+                                isDelimiterChar(sb, i) || isRawEscapeChar(sb.charAt(i)) || isRawQuoteChar(sb.charAt(i));
                     }
                     for (int i = 0; i < sb.length(); i++) {
                         if (needToBeEscaped.test(i)) {
@@ -792,5 +817,4 @@ public int rawWordLength() {
             return rawWordLength;
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/InputRC.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/InputRC.java
new file mode 100644
index 0000000000000..0c3aee057a46d
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/InputRC.java
@@ -0,0 +1,394 @@
+/*
+ * Copyright (c) 2002-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.reader.impl;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import jdk.internal.org.jline.reader.LineReader;
+import jdk.internal.org.jline.reader.Macro;
+import jdk.internal.org.jline.reader.Reference;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.utils.Log;
+
+public final class InputRC {
+
+    public static void configure(LineReader reader, URL url) throws IOException {
+        try (InputStream is = url.openStream()) {
+            configure(reader, is);
+        }
+    }
+
+    public static void configure(LineReader reader, InputStream is) throws IOException {
+        try (InputStreamReader r = new InputStreamReader(is)) {
+            configure(reader, r);
+        }
+    }
+
+    public static void configure(LineReader reader, Reader r) throws IOException {
+        BufferedReader br;
+        if (r instanceof BufferedReader) {
+            br = (BufferedReader) r;
+        } else {
+            br = new BufferedReader(r);
+        }
+
+        Terminal terminal = reader.getTerminal();
+
+        if (Terminal.TYPE_DUMB.equals(terminal.getType()) || Terminal.TYPE_DUMB_COLOR.equals(terminal.getType())) {
+            reader.getVariables().putIfAbsent(LineReader.EDITING_MODE, "dumb");
+        } else {
+            reader.getVariables().putIfAbsent(LineReader.EDITING_MODE, "emacs");
+        }
+
+        reader.setKeyMap(LineReader.MAIN);
+        new InputRC(reader).parse(br);
+        if ("vi".equals(reader.getVariable(LineReader.EDITING_MODE))) {
+            reader.getKeyMaps().put(LineReader.MAIN, reader.getKeyMaps().get(LineReader.VIINS));
+        } else if ("emacs".equals(reader.getVariable(LineReader.EDITING_MODE))) {
+            reader.getKeyMaps().put(LineReader.MAIN, reader.getKeyMaps().get(LineReader.EMACS));
+        } else if ("dumb".equals(reader.getVariable(LineReader.EDITING_MODE))) {
+            reader.getKeyMaps().put(LineReader.MAIN, reader.getKeyMaps().get(LineReader.DUMB));
+        }
+    }
+
+    private final LineReader reader;
+
+    private InputRC(LineReader reader) {
+        this.reader = reader;
+    }
+
+    private void parse(BufferedReader br) throws IOException, IllegalArgumentException {
+        String line;
+        boolean parsing = true;
+        List<Boolean> ifsStack = new ArrayList<>();
+        while ((line = br.readLine()) != null) {
+            try {
+                line = line.trim();
+                if (line.length() == 0) {
+                    continue;
+                }
+                if (line.charAt(0) == '#') {
+                    continue;
+                }
+                int i = 0;
+                if (line.charAt(i) == '$') {
+                    String cmd;
+                    String args;
+                    ++i;
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    int s = i;
+                    while (i < line.length() && (line.charAt(i) != ' ' && line.charAt(i) != '\t')) {
+                        i++;
+                    }
+                    cmd = line.substring(s, i);
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    s = i;
+                    while (i < line.length() && (line.charAt(i) != ' ' && line.charAt(i) != '\t')) {
+                        i++;
+                    }
+                    args = line.substring(s, i);
+                    if ("if".equalsIgnoreCase(cmd)) {
+                        ifsStack.add(parsing);
+                        if (!parsing) {
+                            continue;
+                        }
+                        if (args.startsWith("term=")) {
+                            // TODO
+                        } else if (args.startsWith("mode=")) {
+                            String mode = (String) reader.getVariable(LineReader.EDITING_MODE);
+                            parsing = args.substring("mode=".length()).equalsIgnoreCase(mode);
+                        } else {
+                            parsing = args.equalsIgnoreCase(reader.getAppName());
+                        }
+                    } else if ("else".equalsIgnoreCase(cmd)) {
+                        if (ifsStack.isEmpty()) {
+                            throw new IllegalArgumentException("$else found without matching $if");
+                        }
+                        boolean invert = true;
+                        for (boolean b : ifsStack) {
+                            if (!b) {
+                                invert = false;
+                                break;
+                            }
+                        }
+                        if (invert) {
+                            parsing = !parsing;
+                        }
+                    } else if ("endif".equalsIgnoreCase(cmd)) {
+                        if (ifsStack.isEmpty()) {
+                            throw new IllegalArgumentException("endif found without matching $if");
+                        }
+                        parsing = ifsStack.remove(ifsStack.size() - 1);
+                    } else if ("include".equalsIgnoreCase(cmd)) {
+                        // TODO
+                    }
+                    continue;
+                }
+                if (!parsing) {
+                    continue;
+                }
+                if (line.charAt(i++) == '"') {
+                    boolean esc = false;
+                    for (; ; i++) {
+                        if (i >= line.length()) {
+                            throw new IllegalArgumentException("Missing closing quote on line '" + line + "'");
+                        }
+                        if (esc) {
+                            esc = false;
+                        } else if (line.charAt(i) == '\\') {
+                            esc = true;
+                        } else if (line.charAt(i) == '"') {
+                            break;
+                        }
+                    }
+                }
+                while (i < line.length() && line.charAt(i) != ':' && line.charAt(i) != ' ' && line.charAt(i) != '\t') {
+                    i++;
+                }
+                String keySeq = line.substring(0, i);
+                boolean equivalency = i + 1 < line.length() && line.charAt(i) == ':' && line.charAt(i + 1) == '=';
+                i++;
+                if (equivalency) {
+                    i++;
+                }
+                if (keySeq.equalsIgnoreCase("set")) {
+                    String key;
+                    String val;
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    int s = i;
+                    while (i < line.length() && (line.charAt(i) != ' ' && line.charAt(i) != '\t')) {
+                        i++;
+                    }
+                    key = line.substring(s, i);
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    s = i;
+                    while (i < line.length() && (line.charAt(i) != ' ' && line.charAt(i) != '\t')) {
+                        i++;
+                    }
+                    val = line.substring(s, i);
+                    setVar(reader, key, val);
+                } else {
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    int start = i;
+                    if (i < line.length() && (line.charAt(i) == '\'' || line.charAt(i) == '\"')) {
+                        char delim = line.charAt(i++);
+                        boolean esc = false;
+                        for (; ; i++) {
+                            if (i >= line.length()) {
+                                break;
+                            }
+                            if (esc) {
+                                esc = false;
+                            } else if (line.charAt(i) == '\\') {
+                                esc = true;
+                            } else if (line.charAt(i) == delim) {
+                                break;
+                            }
+                        }
+                    }
+                    for (; i < line.length() && line.charAt(i) != ' ' && line.charAt(i) != '\t'; i++)
+                        ;
+                    String val = line.substring(Math.min(start, line.length()), Math.min(i, line.length()));
+                    if (keySeq.charAt(0) == '"') {
+                        keySeq = translateQuoted(keySeq);
+                    } else {
+                        // Bind key name
+                        String keyName =
+                                keySeq.lastIndexOf('-') > 0 ? keySeq.substring(keySeq.lastIndexOf('-') + 1) : keySeq;
+                        char key = getKeyFromName(keyName);
+                        keyName = keySeq.toLowerCase();
+                        keySeq = "";
+                        if (keyName.contains("meta-") || keyName.contains("m-")) {
+                            keySeq += "\u001b";
+                        }
+                        if (keyName.contains("control-") || keyName.contains("c-") || keyName.contains("ctrl-")) {
+                            key = (char) (Character.toUpperCase(key) & 0x1f);
+                        }
+                        keySeq += key;
+                    }
+                    if (val.length() > 0 && (val.charAt(0) == '\'' || val.charAt(0) == '\"')) {
+                        reader.getKeys().bind(new Macro(translateQuoted(val)), keySeq);
+                    } else {
+                        reader.getKeys().bind(new Reference(val), keySeq);
+                    }
+                }
+            } catch (IllegalArgumentException e) {
+                Log.warn("Unable to parse user configuration: ", e);
+            }
+        }
+    }
+
+    private static String translateQuoted(String keySeq) {
+        int i;
+        String str = keySeq.substring(1, keySeq.length() - 1);
+        StringBuilder sb = new StringBuilder();
+        for (i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (c == '\\') {
+                boolean ctrl = str.regionMatches(i, "\\C-", 0, 3) || str.regionMatches(i, "\\M-\\C-", 0, 6);
+                boolean meta = str.regionMatches(i, "\\M-", 0, 3) || str.regionMatches(i, "\\C-\\M-", 0, 6);
+                i += (meta ? 3 : 0) + (ctrl ? 3 : 0) + (!meta && !ctrl ? 1 : 0);
+                if (i >= str.length()) {
+                    break;
+                }
+                c = str.charAt(i);
+                if (meta) {
+                    sb.append("\u001b");
+                }
+                if (ctrl) {
+                    c = c == '?' ? 0x7f : (char) (Character.toUpperCase(c) & 0x1f);
+                }
+                if (!meta && !ctrl) {
+                    switch (c) {
+                        case 'a':
+                            c = 0x07;
+                            break;
+                        case 'b':
+                            c = '\b';
+                            break;
+                        case 'd':
+                            c = 0x7f;
+                            break;
+                        case 'e':
+                            c = 0x1b;
+                            break;
+                        case 'f':
+                            c = '\f';
+                            break;
+                        case 'n':
+                            c = '\n';
+                            break;
+                        case 'r':
+                            c = '\r';
+                            break;
+                        case 't':
+                            c = '\t';
+                            break;
+                        case 'v':
+                            c = 0x0b;
+                            break;
+                        case '\\':
+                            c = '\\';
+                            break;
+                        case '0':
+                        case '1':
+                        case '2':
+                        case '3':
+                        case '4':
+                        case '5':
+                        case '6':
+                        case '7':
+                            c = 0;
+                            for (int j = 0; j < 3; j++, i++) {
+                                if (i >= str.length()) {
+                                    break;
+                                }
+                                int k = Character.digit(str.charAt(i), 8);
+                                if (k < 0) {
+                                    break;
+                                }
+                                c = (char) (c * 8 + k);
+                            }
+                            c &= 0xFF;
+                            break;
+                        case 'x':
+                            i++;
+                            c = 0;
+                            for (int j = 0; j < 2; j++, i++) {
+                                if (i >= str.length()) {
+                                    break;
+                                }
+                                int k = Character.digit(str.charAt(i), 16);
+                                if (k < 0) {
+                                    break;
+                                }
+                                c = (char) (c * 16 + k);
+                            }
+                            c &= 0xFF;
+                            break;
+                        case 'u':
+                            i++;
+                            c = 0;
+                            for (int j = 0; j < 4; j++, i++) {
+                                if (i >= str.length()) {
+                                    break;
+                                }
+                                int k = Character.digit(str.charAt(i), 16);
+                                if (k < 0) {
+                                    break;
+                                }
+                                c = (char) (c * 16 + k);
+                            }
+                            break;
+                    }
+                }
+                sb.append(c);
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    private static char getKeyFromName(String name) {
+        if ("DEL".equalsIgnoreCase(name) || "Rubout".equalsIgnoreCase(name)) {
+            return 0x7f;
+        } else if ("ESC".equalsIgnoreCase(name) || "Escape".equalsIgnoreCase(name)) {
+            return '\033';
+        } else if ("LFD".equalsIgnoreCase(name) || "NewLine".equalsIgnoreCase(name)) {
+            return '\n';
+        } else if ("RET".equalsIgnoreCase(name) || "Return".equalsIgnoreCase(name)) {
+            return '\r';
+        } else if ("SPC".equalsIgnoreCase(name) || "Space".equalsIgnoreCase(name)) {
+            return ' ';
+        } else if ("Tab".equalsIgnoreCase(name)) {
+            return '\t';
+        } else {
+            return name.charAt(0);
+        }
+    }
+
+    static void setVar(LineReader reader, String key, String val) {
+        if (LineReader.KEYMAP.equalsIgnoreCase(key)) {
+            reader.setKeyMap(val);
+            return;
+        }
+
+        for (LineReader.Option option : LineReader.Option.values()) {
+            if (option.name().toLowerCase(Locale.ENGLISH).replace('_', '-').equals(val)) {
+                if ("on".equalsIgnoreCase(val)) {
+                    reader.setOpt(option);
+                } else if ("off".equalsIgnoreCase(val)) {
+                    reader.unsetOpt(option);
+                }
+                return;
+            }
+        }
+
+        reader.setVariable(key, val);
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/KillRing.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/KillRing.java
index f89ed35d04e0d..2510fd9e32035 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/KillRing.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/KillRing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
index a41f7d19bf8b1..da69d08b23c8d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, the original author or authors.
+ * Copyright (c) 2002-2023, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,6 +18,9 @@
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.lang.reflect.Constructor;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -56,6 +59,7 @@
 import static jdk.internal.org.jline.keymap.KeyMap.esc;
 import static jdk.internal.org.jline.keymap.KeyMap.range;
 import static jdk.internal.org.jline.keymap.KeyMap.translate;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_DISABLE_ALTERNATE_CHARSET;
 
 /**
  * A reader for terminal applications. It supports custom tab-completion,
@@ -66,23 +70,27 @@
  * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  */
 @SuppressWarnings("StatementWithEmptyBody")
-public class LineReaderImpl implements LineReader, Flushable
-{
+public class LineReaderImpl implements LineReader, Flushable {
     public static final char NULL_MASK = 0;
 
+    /**
+     * @deprecated use {@link #DEFAULT_TAB_WIDTH} and {@link #getTabWidth()}
+     */
+    @Deprecated
     public static final int TAB_WIDTH = 4;
 
+    public static final int DEFAULT_TAB_WIDTH = 4;
 
     public static final String DEFAULT_WORDCHARS = "*?_-.[]~=/&;!#$%^(){}<>";
     public static final String DEFAULT_REMOVE_SUFFIX_CHARS = " \t\n;&|";
     public static final String DEFAULT_COMMENT_BEGIN = "#";
     public static final String DEFAULT_SEARCH_TERMINATORS = "\033\012";
     public static final String DEFAULT_BELL_STYLE = "";
-    public static final int    DEFAULT_LIST_MAX = 100;
-    public static final int    DEFAULT_MENU_LIST_MAX = Integer.MAX_VALUE;
-    public static final int    DEFAULT_ERRORS = 2;
-    public static final long   DEFAULT_BLINK_MATCHING_PAREN = 500L;
-    public static final long   DEFAULT_AMBIGUOUS_BINDING = 1000L;
+    public static final int DEFAULT_LIST_MAX = 100;
+    public static final int DEFAULT_MENU_LIST_MAX = Integer.MAX_VALUE;
+    public static final int DEFAULT_ERRORS = 2;
+    public static final long DEFAULT_BLINK_MATCHING_PAREN = 500L;
+    public static final long DEFAULT_AMBIGUOUS_BINDING = 1000L;
     public static final String DEFAULT_SECONDARY_PROMPT_PATTERN = "%M> ";
     public static final String DEFAULT_OTHERS_GROUP_NAME = "others";
     public static final String DEFAULT_ORIGINAL_GROUP_NAME = "original";
@@ -96,9 +104,10 @@ public class LineReaderImpl implements LineReader, Flushable
     public static final String DEFAULT_COMPLETION_STYLE_LIST_GROUP = "fg:black,bold";
     public static final String DEFAULT_COMPLETION_STYLE_LIST_SELECTION = DEFAULT_COMPLETION_STYLE_SELECTION;
     public static final String DEFAULT_COMPLETION_STYLE_LIST_BACKGROUND = "bg:bright-magenta";
-    public static final int    DEFAULT_INDENTATION = 0;
-    public static final int    DEFAULT_FEATURES_MAX_BUFFER_SIZE = 1000;
-    public static final int    DEFAULT_SUGGESTIONS_MIN_BUFFER_SIZE = 1;
+    public static final int DEFAULT_INDENTATION = 0;
+    public static final int DEFAULT_FEATURES_MAX_BUFFER_SIZE = 1000;
+    public static final int DEFAULT_SUGGESTIONS_MIN_BUFFER_SIZE = 1;
+    public static final String DEFAULT_SYSTEM_PROPERTY_PREFIX = "org.jline.reader.props.";
 
     private static final int MIN_ROWS = 3;
 
@@ -109,6 +118,7 @@ public class LineReaderImpl implements LineReader, Flushable
 
     public static final String FOCUS_IN_SEQ = "\033[I";
     public static final String FOCUS_OUT_SEQ = "\033[O";
+    public static final int DEFAULT_MAX_REPEAT_COUNT = 9999;
 
     /**
      * Possible states in which the current readline operation may be in.
@@ -197,27 +207,28 @@ protected enum BellType {
     protected int searchIndex = -1;
     protected boolean doAutosuggestion;
 
-
     // Reading buffers
     protected final BindingReader bindingReader;
 
-
     /**
      * VI character find
      */
     protected int findChar;
+
     protected int findDir;
     protected int findTailAdd;
     /**
      * VI history string search
      */
     private int searchDir;
+
     private String searchString;
 
     /**
      * Region state
      */
     protected int regionMark;
+
     protected RegionType regionActive;
 
     private boolean forceChar;
@@ -232,7 +243,7 @@ protected enum BellType {
 
     protected KillRing killRing = new KillRing();
 
-    protected UndoTree<Buffer> undo = new UndoTree<>(this::setBuffer);
+    protected UndoTree<Buffer> undo;
     protected boolean isUndo;
 
     /**
@@ -242,7 +253,7 @@ protected enum BellType {
     /*
      * Current internal state of the line reader
      */
-    protected State   state = State.DONE;
+    protected State state = State.DONE;
     protected final AtomicBoolean startedReading = new AtomicBoolean();
     protected boolean reading;
 
@@ -278,7 +289,10 @@ protected enum BellType {
      */
     protected List<String> commandsBuffer = new ArrayList<>();
 
-    int candidateStartPosition = 0;
+    protected int candidateStartPosition = 0;
+
+    protected String alternateIn;
+    protected String alternateOut;
 
     public LineReaderImpl(Terminal terminal) throws IOException {
         this(terminal, terminal.getName(), null);
@@ -288,6 +302,7 @@ public LineReaderImpl(Terminal terminal, String appName) throws IOException {
         this(terminal, appName, null);
     }
 
+    @SuppressWarnings("this-escape")
     public LineReaderImpl(Terminal terminal, String appName, Map<String, Object> variables) {
         Objects.requireNonNull(terminal, "terminal can not be null");
         this.terminal = terminal;
@@ -300,11 +315,40 @@ public LineReaderImpl(Terminal terminal, String appName, Map<String, Object> var
         } else {
             this.variables = new HashMap<>();
         }
+        String prefix = getString(SYSTEM_PROPERTY_PREFIX, DEFAULT_SYSTEM_PROPERTY_PREFIX);
+        if (prefix != null) {
+            Properties sysProps = System.getProperties();
+            for (String s : sysProps.stringPropertyNames()) {
+                if (s.startsWith(prefix)) {
+                    String key = s.substring(prefix.length());
+                    InputRC.setVar(this, key, sysProps.getProperty(s));
+                }
+            }
+        }
+
         this.keyMaps = defaultKeyMaps();
+        if (!Boolean.getBoolean(PROP_DISABLE_ALTERNATE_CHARSET)) {
+            this.alternateIn = Curses.tputs(terminal.getStringCapability(Capability.enter_alt_charset_mode));
+            this.alternateOut = Curses.tputs(terminal.getStringCapability(Capability.exit_alt_charset_mode));
+        }
 
+        undo = new UndoTree<>(this::setBuffer);
         builtinWidgets = builtinWidgets();
         widgets = new HashMap<>(builtinWidgets);
         bindingReader = new BindingReader(terminal.reader());
+
+        String inputRc = getString(INPUT_RC_FILE_NAME, null);
+        if (inputRc != null) {
+            Path inputRcPath = Paths.get(inputRc);
+            if (Files.exists(inputRcPath)) {
+                try (InputStream is = Files.newInputStream(inputRcPath)) {
+                    InputRC.configure(this, is);
+                } catch (Exception e) {
+                    Log.debug("Error reading inputRc config file: ", inputRc, e);
+                }
+            }
+        }
+
         doDisplay();
     }
 
@@ -489,7 +533,8 @@ public String readLine(String prompt, Character mask) throws UserInterruptExcept
      * @param buffer    A string that will be set for editing.
      * @return          A line that is read from the terminal, can never be null.
      */
-    public String readLine(String prompt, Character mask, String buffer) throws UserInterruptException, EndOfFileException {
+    public String readLine(String prompt, Character mask, String buffer)
+            throws UserInterruptException, EndOfFileException {
         return readLine(prompt, null, mask, buffer);
     }
 
@@ -503,7 +548,8 @@ public String readLine(String prompt, Character mask, String buffer) throws User
      * @param buffer      A string that will be set for editing.
      * @return            A line that is read from the terminal, can never be null.
      */
-    public String readLine(String prompt, String rightPrompt, Character mask, String buffer) throws UserInterruptException, EndOfFileException {
+    public String readLine(String prompt, String rightPrompt, Character mask, String buffer)
+            throws UserInterruptException, EndOfFileException {
         return readLine(prompt, rightPrompt, mask != null ? new SimpleMaskingCallback(mask) : null, buffer);
     }
 
@@ -517,7 +563,8 @@ public String readLine(String prompt, String rightPrompt, Character mask, String
      * @param buffer          A string that will be set for editing.
      * @return                A line that is read from the terminal, can never be null.
      */
-    public String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallback, String buffer) throws UserInterruptException, EndOfFileException {
+    public String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallback, String buffer)
+            throws UserInterruptException, EndOfFileException {
         // prompt may be null
         // maskingCallback may be null
         // buffer may be null
@@ -618,23 +665,14 @@ public String readLine(String prompt, String rightPrompt, MaskingCallback maskin
                 // Move into application mode
                 if (!dumb) {
                     terminal.puts(Capability.keypad_xmit);
-                    if (isSet(Option.AUTO_FRESH_LINE))
-                        callWidget(FRESH_LINE);
-                    if (isSet(Option.MOUSE))
-                        terminal.trackMouse(Terminal.MouseTracking.Normal);
-                    if (isSet(Option.BRACKETED_PASTE))
-                        terminal.writer().write(BRACKETED_PASTE_ON);
-                } else {
-                    // For dumb terminals, we need to make sure that CR are ignored
-                    Attributes attr = new Attributes(originalAttributes);
-                    attr.setInputFlag(Attributes.InputFlag.IGNCR, true);
-                    terminal.setAttributes(attr);
+                    if (isSet(Option.AUTO_FRESH_LINE)) callWidget(FRESH_LINE);
+                    if (isSet(Option.MOUSE)) terminal.trackMouse(Terminal.MouseTracking.Normal);
+                    if (isSet(Option.BRACKETED_PASTE)) terminal.writer().write(BRACKETED_PASTE_ON);
                 }
 
                 callWidget(CALLBACK_INIT);
 
-                if (!isSet(Option.DISABLE_UNDO))
-                    undo.newState(buf.copy());
+                if (!isSet(Option.DISABLE_UNDO)) undo.newState(buf.copy());
 
                 // Draw initial prompt
                 redrawLine();
@@ -654,7 +692,8 @@ public String readLine(String prompt, String rightPrompt, MaskingCallback maskin
                     throw new EndOfFileException().partialLine(buf.length() > 0 ? buf.toString() : null);
                 }
                 Log.trace("Binding: ", o);
-                if (buf.length() == 0 && getLastBinding().charAt(0) == originalAttributes.getControlChar(ControlChar.VEOF)) {
+                if (buf.length() == 0
+                        && getLastBinding().charAt(0) == originalAttributes.getControlChar(ControlChar.VEOF)) {
                     throw new EndOfFileException();
                 }
 
@@ -675,12 +714,17 @@ public String readLine(String prompt, String rightPrompt, MaskingCallback maskin
                 try {
                     lock.lock();
                     // Get executable widget
-                    Buffer copy = buf.length() <= getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE) ? buf.copy() : null;
+                    Buffer copy = buf.length() <= getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE)
+                            ? buf.copy()
+                            : null;
                     Widget w = getWidget(o);
                     if (!w.apply()) {
                         beep();
                     }
-                    if (!isSet(Option.DISABLE_UNDO) && !isUndo && copy != null && buf.length() <= getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE)
+                    if (!isSet(Option.DISABLE_UNDO)
+                            && !isUndo
+                            && copy != null
+                            && buf.length() <= getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE)
                             && !copy.toString().equals(buf.toString())) {
                         undo.newState(buf.copy());
                     }
@@ -718,13 +762,18 @@ public String readLine(String prompt, String rightPrompt, MaskingCallback maskin
             } else {
                 throw e;
             }
-        }
-        finally {
+        } finally {
+            AtomicBoolean interrupted = new AtomicBoolean(Thread.interrupted());
             try {
                 lock.lock();
 
                 this.reading = false;
 
+                Terminal.SignalHandler tmpHandler = terminal.handle(Signal.INT, s -> interrupted.set(true));
+                if (previousIntrHandler == null) {
+                    previousIntrHandler = tmpHandler;
+                }
+
                 cleanup();
                 if (originalAttributes != null) {
                     terminal.setAttributes(originalAttributes);
@@ -741,13 +790,15 @@ public String readLine(String prompt, String rightPrompt, MaskingCallback maskin
             } finally {
                 lock.unlock();
                 startedReading.set(false);
+                if (interrupted.get()) {
+                    Thread.currentThread().interrupt();
+                }
             }
         }
     }
 
     private boolean isTerminalDumb() {
-        return Terminal.TYPE_DUMB.equals(terminal.getType())
-                || Terminal.TYPE_DUMB_COLOR.equals(terminal.getType());
+        return Terminal.TYPE_DUMB.equals(terminal.getType()) || Terminal.TYPE_DUMB_COLOR.equals(terminal.getType());
     }
 
     private void doDisplay() {
@@ -757,8 +808,7 @@ private void doDisplay() {
 
         display = new Display(terminal, false);
         display.resize(size.getRows(), size.getColumns());
-        if (isSet(Option.DELAY_LINE_WRAP))
-            display.setDelayLineWrap(true);
+        if (isSet(Option.DELAY_LINE_WRAP)) display.setDelayLineWrap(true);
     }
 
     @Override
@@ -965,8 +1015,10 @@ public Binding readBinding(KeyMap<Binding> keys, KeyMap<Binding> local) {
             if (!YANK_POP.equals(ref) && !YANK.equals(ref)) {
                 killRing.resetLastYank();
             }
-            if (!KILL_LINE.equals(ref) && !KILL_WHOLE_LINE.equals(ref)
-                    && !BACKWARD_KILL_WORD.equals(ref) && !KILL_WORD.equals(ref)) {
+            if (!KILL_LINE.equals(ref)
+                    && !KILL_WHOLE_LINE.equals(ref)
+                    && !BACKWARD_KILL_WORD.equals(ref)
+                    && !KILL_WORD.equals(ref)) {
                 killRing.resetLastKill();
             }
         }
@@ -1083,7 +1135,7 @@ public void editAndAddInBuffer(File file) throws Exception {
         if (isSet(Option.BRACKETED_PASTE)) {
             terminal.writer().write(BRACKETED_PASTE_OFF);
         }
-        Constructor<?> ctor = Class.forName("jdk.internal.org.jline.builtins.Nano").getConstructor(Terminal.class, File.class);
+        Constructor<?> ctor = Class.forName("org.jline.builtins.Nano").getConstructor(Terminal.class, File.class);
         Editor editor = (Editor) ctor.newInstance(terminal, new File(file.getParent()));
         editor.setRestricted(true);
         editor.open(Collections.singletonList(file.getName()));
@@ -1097,6 +1149,10 @@ public void editAndAddInBuffer(File file) throws Exception {
         }
     }
 
+    protected int getTabWidth() {
+        return getInt(LineReader.TAB_WIDTH, DEFAULT_TAB_WIDTH);
+    }
+
     //
     // Widget implementation
     //
@@ -1137,26 +1193,27 @@ protected String finish(String str) {
         }
 
         // we only add it to the history if the buffer is not empty
-        if (historyLine != null && historyLine.length() > 0 ) {
+        if (historyLine != null && historyLine.length() > 0) {
             history.add(Instant.now(), historyLine);
         }
         return str;
     }
 
-    protected void handleSignal(Signal signal) {
+    protected synchronized void handleSignal(Signal signal) {
         doAutosuggestion = false;
         if (signal == Signal.WINCH) {
+            size.copy(terminal.getBufferSize());
+            display.resize(size.getRows(), size.getColumns());
             Status status = Status.getStatus(terminal, false);
             if (status != null) {
-                status.hardReset();
+                status.resize(size);
+                status.reset();
             }
-            size.copy(terminal.getBufferSize());
-            display.resize(size.getRows(), size.getColumns());
-            // restores prompt but also prevents scrolling in consoleZ, see #492
-            // redrawLine();
+            terminal.puts(Capability.carriage_return);
+            terminal.puts(Capability.clr_eos);
+            redrawLine();
             redisplay();
-        }
-        else if (signal == Signal.CONT) {
+        } else if (signal == Signal.CONT) {
             terminal.enterRawMode();
             size.copy(terminal.getBufferSize());
             display.resize(size.getRows(), size.getColumns());
@@ -1200,13 +1257,11 @@ protected Widget getWidget(Object binding) {
     //
 
     public void setPrompt(final String prompt) {
-        this.prompt = (prompt == null ? AttributedString.EMPTY
-                       : expandPromptPattern(prompt, 0, "", 0));
+        this.prompt = (prompt == null ? AttributedString.EMPTY : expandPromptPattern(prompt, 0, "", 0));
     }
 
     public void setRightPrompt(final String rightPrompt) {
-        this.rightPrompt = (rightPrompt == null ? AttributedString.EMPTY
-                            : expandPromptPattern(rightPrompt, 0, "", 0));
+        this.rightPrompt = (rightPrompt == null ? AttributedString.EMPTY : expandPromptPattern(rightPrompt, 0, "", 0));
     }
 
     protected void setBuffer(Buffer buffer) {
@@ -1233,7 +1288,7 @@ protected void setBuffer(final String buffer) {
      * @param op The incoming operation to remap
      * @return The remaped operation
      */
-    protected String viDeleteChangeYankToRemap (String op) {
+    protected String viDeleteChangeYankToRemap(String op) {
         switch (op) {
             case SEND_BREAK:
             case BACKWARD_CHAR:
@@ -1292,7 +1347,6 @@ protected boolean isInViCmdMode() {
         return VICMD.equals(keyMap);
     }
 
-
     //
     // Movement
     //
@@ -1332,7 +1386,6 @@ protected boolean viBackwardChar() {
         return true;
     }
 
-
     //
     // Word movement
     //
@@ -1365,9 +1418,7 @@ protected boolean viForwardWord() {
                     buf.move(1);
                 }
             } else {
-                while (buf.cursor() < buf.length()
-                        && !isViAlphaNum(buf.currChar())
-                        && !isWhitespace(buf.currChar())) {
+                while (buf.cursor() < buf.length() && !isViAlphaNum(buf.currChar()) && !isWhitespace(buf.currChar())) {
                     buf.move(1);
                 }
             }
@@ -1375,9 +1426,7 @@ protected boolean viForwardWord() {
                 return true;
             }
             int nl = buf.currChar() == '\n' ? 1 : 0;
-            while (buf.cursor() < buf.length()
-                    && nl < 2
-                    && isWhitespace(buf.currChar())) {
+            while (buf.cursor() < buf.length() && nl < 2 && isWhitespace(buf.currChar())) {
                 buf.move(1);
                 nl += buf.currChar() == '\n' ? 1 : 0;
             }
@@ -1397,9 +1446,7 @@ protected boolean viForwardBlankWord() {
                 return true;
             }
             int nl = buf.currChar() == '\n' ? 1 : 0;
-            while (buf.cursor() < buf.length()
-                    && nl < 2
-                    && isWhitespace(buf.currChar())) {
+            while (buf.cursor() < buf.length() && nl < 2 && isWhitespace(buf.currChar())) {
                 buf.move(1);
                 nl += buf.currChar() == '\n' ? 1 : 0;
             }
@@ -1451,7 +1498,9 @@ protected boolean viForwardWordEnd() {
                     }
                 } else {
                     buf.move(1);
-                    while (buf.cursor() < buf.length() && !isViAlphaNum(buf.nextChar()) && !isWhitespace(buf.nextChar())) {
+                    while (buf.cursor() < buf.length()
+                            && !isViAlphaNum(buf.nextChar())
+                            && !isWhitespace(buf.nextChar())) {
                         buf.move(1);
                     }
                 }
@@ -1720,9 +1769,7 @@ protected boolean capitalizeWord() {
                 buf.move(1);
             }
             while (buf.cursor() < buf.length() && isWord(buf.currChar())) {
-                buf.currChar(first
-                        ? Character.toUpperCase(buf.currChar())
-                        : Character.toLowerCase(buf.currChar()));
+                buf.currChar(first ? Character.toUpperCase(buf.currChar()) : Character.toLowerCase(buf.currChar()));
                 buf.move(1);
                 first = false;
             }
@@ -1810,7 +1857,8 @@ protected boolean transposeWords() {
                 sta1--;
             }
             end1 = sta1;
-            while (end1 < lend && !isDelimiter(buf.atChar(++end1)));
+            while (end1 < lend && !isDelimiter(buf.atChar(++end1)))
+                ;
             if (neg) {
                 end2 = sta1 - 1;
                 while (end2 > lstart && isDelimiter(buf.atChar(end2 - 1))) {
@@ -1819,9 +1867,11 @@ protected boolean transposeWords() {
                 if (end2 < lstart) {
                     // No word before, use the word after
                     sta2 = end1;
-                    while (isDelimiter(buf.atChar(++sta2)));
+                    while (isDelimiter(buf.atChar(++sta2)))
+                        ;
                     end2 = sta2;
-                    while (end2 < lend && !isDelimiter(buf.atChar(++end2)));
+                    while (end2 < lend && !isDelimiter(buf.atChar(++end2)))
+                        ;
                 } else {
                     sta2 = end2;
                     while (sta2 > lstart && !isDelimiter(buf.atChar(sta2 - 1))) {
@@ -1830,7 +1880,8 @@ protected boolean transposeWords() {
                 }
             } else {
                 sta2 = end1;
-                while (sta2 < lend && isDelimiter(buf.atChar(++sta2)));
+                while (sta2 < lend && isDelimiter(buf.atChar(++sta2)))
+                    ;
                 if (sta2 == lend) {
                     // No word after, use the word before
                     end2 = sta1;
@@ -1843,19 +1894,24 @@ protected boolean transposeWords() {
                     }
                 } else {
                     end2 = sta2;
-                    while (end2 < lend && !isDelimiter(buf.atChar(++end2))) ;
+                    while (end2 < lend && !isDelimiter(buf.atChar(++end2)))
+                        ;
                 }
             }
             if (sta1 < sta2) {
-                String res = buf.substring(0, sta1) + buf.substring(sta2, end2)
-                        + buf.substring(end1, sta2) + buf.substring(sta1, end1)
+                String res = buf.substring(0, sta1)
+                        + buf.substring(sta2, end2)
+                        + buf.substring(end1, sta2)
+                        + buf.substring(sta1, end1)
                         + buf.substring(end2);
                 buf.clear();
                 buf.write(res);
                 buf.cursor(neg ? end1 : end2);
             } else {
-                String res = buf.substring(0, sta2) + buf.substring(sta1, end1)
-                        + buf.substring(end2, sta1) + buf.substring(sta2, end2)
+                String res = buf.substring(0, sta2)
+                        + buf.substring(sta1, end1)
+                        + buf.substring(end2, sta1)
+                        + buf.substring(sta2, end2)
                         + buf.substring(end1);
                 buf.clear();
                 buf.write(res);
@@ -1988,11 +2044,11 @@ private boolean vifindchar(boolean repeat) {
         while (count-- > 0) {
             do {
                 buf.move(findDir);
-            } while (buf.cursor() > 0 && buf.cursor() < buf.length()
+            } while (buf.cursor() > 0
+                    && buf.cursor() < buf.length()
                     && buf.currChar() != findChar
                     && buf.currChar() != '\n');
-            if (buf.cursor() <= 0 || buf.cursor() >= buf.length()
-                    || buf.currChar() == '\n') {
+            if (buf.cursor() <= 0 || buf.cursor() >= buf.length() || buf.currChar() == '\n') {
                 buf.cursor(cursor);
                 return false;
             }
@@ -2211,18 +2267,17 @@ protected boolean undefinedKey() {
      *   character or if there was no matching bracket.
      */
     protected boolean doViMatchBracket() {
-        int pos        = buf.cursor();
+        int pos = buf.cursor();
 
         if (pos == buf.length()) {
             return false;
         }
 
-        int type       = getBracketType(buf.atChar(pos));
-        int move       = (type < 0) ? -1 : 1;
-        int count      = 1;
+        int type = getBracketType(buf.atChar(pos));
+        int move = (type < 0) ? -1 : 1;
+        int count = 1;
 
-        if (type == 0)
-            return false;
+        if (type == 0) return false;
 
         while (count > 0) {
             pos += move;
@@ -2235,8 +2290,7 @@ protected boolean doViMatchBracket() {
             int curType = getBracketType(buf.atChar(pos));
             if (curType == type) {
                 ++count;
-            }
-            else if (curType == -type) {
+            } else if (curType == -type) {
                 --count;
             }
         }
@@ -2245,8 +2299,7 @@ else if (curType == -type) {
          * Slight adjustment for delete-to, yank-to, change-to to ensure
          * that the matching paren is consumed
          */
-        if (move > 0 && isInViMoveOperation())
-            ++pos;
+        if (move > 0 && isInViMoveOperation()) ++pos;
 
         buf.cursor(pos);
         return true;
@@ -2259,14 +2312,20 @@ else if (curType == -type) {
      * @return 1 is square, 2 curly, 3 parent, or zero for none.  The value
      *   will be negated if it is the closing form of the bracket.
      */
-    protected int getBracketType (int ch) {
+    protected int getBracketType(int ch) {
         switch (ch) {
-            case '[': return  1;
-            case ']': return -1;
-            case '{': return  2;
-            case '}': return -2;
-            case '(': return  3;
-            case ')': return -3;
+            case '[':
+                return 1;
+            case ']':
+                return -1;
+            case '{':
+                return 2;
+            case '}':
+                return -2;
+            case '(':
+                return 3;
+            case ')':
+                return -3;
             default:
                 return 0;
         }
@@ -2331,7 +2390,7 @@ protected boolean sendBreak() {
             buf.clear();
             println();
             redrawLine();
-//            state = State.INTERRUPT;
+            //            state = State.INTERRUPT;
             return false;
         }
         return true;
@@ -2378,6 +2437,10 @@ protected boolean negArgument() {
     protected boolean digitArgument() {
         String s = getLastBinding();
         repeatCount = (repeatCount * 10) + s.charAt(s.length() - 1) - '0';
+        int maxRepeatCount = getInt(MAX_REPEAT_COUNT, DEFAULT_MAX_REPEAT_COUNT);
+        if (repeatCount > maxRepeatCount) {
+            throw new IllegalArgumentException("digit argument should be less than " + maxRepeatCount);
+        }
         isArgDigit = true;
         return true;
     }
@@ -2438,10 +2501,12 @@ protected boolean viYankTo() {
     protected boolean viYankWholeLine() {
         int s, e;
         int p = buf.cursor();
-        while (buf.move(-1) == -1 && buf.prevChar() != '\n') ;
+        while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+            ;
         s = buf.cursor();
         for (int i = 0; i < repeatCount; i++) {
-            while (buf.move(1) == 1 && buf.prevChar() != '\n') ;
+            while (buf.move(1) == 1 && buf.prevChar() != '\n')
+                ;
         }
         e = buf.cursor();
         yankBuffer = buf.substring(s, e);
@@ -2554,15 +2619,19 @@ protected boolean historyIncrementalSearchBackward() {
         return doSearchHistory(true);
     }
 
-    static class Pair<U,V> {
-        final U u; final V v;
+    static class Pair<U, V> {
+        final U u;
+        final V v;
+
         public Pair(U u, V v) {
             this.u = u;
             this.v = v;
         }
+
         public U getU() {
             return u;
         }
+
         public V getV() {
             return v;
         }
@@ -2575,7 +2644,8 @@ protected boolean doSearchHistory(boolean backward) {
 
         KeyMap<Binding> terminators = new KeyMap<>();
         getString(SEARCH_TERMINATORS, DEFAULT_SEARCH_TERMINATORS)
-                .codePoints().forEach(c -> bind(terminators, ACCEPT_LINE, new String(Character.toChars(c))));
+                .codePoints()
+                .forEach(c -> bind(terminators, ACCEPT_LINE, new String(Character.toChars(c))));
 
         Buffer originalBuffer = buf.copy();
         searchIndex = -1;
@@ -2583,8 +2653,8 @@ protected boolean doSearchHistory(boolean backward) {
         searchBackward = backward;
         searchFailing = false;
         post = () -> new AttributedString((searchFailing ? "failing" + " " : "")
-                        + (searchBackward ? "bck-i-search" : "fwd-i-search")
-                        + ": " + searchTerm + "_");
+                + (searchBackward ? "bck-i-search" : "fwd-i-search")
+                + ": " + searchTerm + "_");
 
         redisplay();
         try {
@@ -2630,8 +2700,9 @@ protected boolean doSearchHistory(boolean backward) {
                     searchFailing = false;
                 } else {
                     boolean caseInsensitive = isSet(Option.CASE_INSENSITIVE_SEARCH);
-                    Pattern pat = Pattern.compile(pattern, caseInsensitive ? Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-                                                                           : Pattern.UNICODE_CASE);
+                    Pattern pat = Pattern.compile(
+                            pattern,
+                            caseInsensitive ? Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE : Pattern.UNICODE_CASE);
                     Pair<Integer, Integer> pair = null;
                     if (searchBackward) {
                         boolean nextOnly = next;
@@ -2641,7 +2712,11 @@ protected boolean doSearchHistory(boolean backward) {
                                 .orElse(null);
                         if (pair == null) {
                             pair = StreamSupport.stream(
-                                    Spliterators.spliteratorUnknownSize(history.reverseIterator(searchIndex < 0 ? history.last() : searchIndex - 1), Spliterator.ORDERED), false)
+                                            Spliterators.spliteratorUnknownSize(
+                                                    history.reverseIterator(
+                                                            searchIndex < 0 ? history.last() : searchIndex - 1),
+                                                    Spliterator.ORDERED),
+                                            false)
                                     .flatMap(e -> matches(pat, e.line(), e.index()).stream())
                                     .findFirst()
                                     .orElse(null);
@@ -2654,7 +2729,11 @@ protected boolean doSearchHistory(boolean backward) {
                                 .orElse(null);
                         if (pair == null) {
                             pair = StreamSupport.stream(
-                                    Spliterators.spliteratorUnknownSize(history.iterator((searchIndex < 0 ? history.last() : searchIndex) + 1), Spliterator.ORDERED), false)
+                                            Spliterators.spliteratorUnknownSize(
+                                                    history.iterator(
+                                                            (searchIndex < 0 ? history.last() : searchIndex) + 1),
+                                                    Spliterator.ORDERED),
+                                            false)
                                     .flatMap(e -> matches(pat, e.line(), e.index()).stream())
                                     .findFirst()
                                     .orElse(null);
@@ -2714,7 +2793,10 @@ private String doGetSearchPattern() {
                     sb.append("\\E");
                     inQuote = false;
                 }
-                sb.append("[").append(Character.toLowerCase(c)).append(Character.toUpperCase(c)).append("]");
+                sb.append("[")
+                        .append(Character.toLowerCase(c))
+                        .append(Character.toUpperCase(c))
+                        .append("]");
             } else {
                 if (!inQuote) {
                     sb.append("\\Q");
@@ -2742,8 +2824,7 @@ private void pushBackBinding(boolean skip) {
     }
 
     protected boolean historySearchForward() {
-        if (historyBuffer == null || buf.length() == 0
-                || !buf.toString().equals(history.current())) {
+        if (historyBuffer == null || buf.length() == 0 || !buf.toString().equals(history.current())) {
             historyBuffer = buf.copy();
             searchBuffer = getFirstWord();
         }
@@ -2791,8 +2872,7 @@ private CharSequence getFirstWord() {
     }
 
     protected boolean historySearchBackward() {
-        if (historyBuffer == null || buf.length() == 0
-                || !buf.toString().equals(history.current())) {
+        if (historyBuffer == null || buf.length() == 0 || !buf.toString().equals(history.current())) {
             historyBuffer = buf.copy();
             searchBuffer = getFirstWord();
         }
@@ -2984,7 +3064,7 @@ protected boolean acceptLine() {
     }
 
     void indention(int nb, StringBuilder sb) {
-        int indent = getInt(INDENTATION, DEFAULT_INDENTATION)*nb;
+        int indent = getInt(INDENTATION, DEFAULT_INDENTATION) * nb;
         for (int i = 0; i < indent; i++) {
             sb.append(' ');
         }
@@ -3017,7 +3097,6 @@ protected boolean overwriteMode() {
         return true;
     }
 
-
     //
     // History Control
     //
@@ -3108,13 +3187,11 @@ protected boolean downHistory() {
     }
 
     protected boolean viUpLineOrHistory() {
-        return upLine()
-                || upHistory() && viFirstNonBlank();
+        return upLine() || upHistory() && viFirstNonBlank();
     }
 
     protected boolean viDownLineOrHistory() {
-        return downLine()
-                || downHistory() && viFirstNonBlank();
+        return downLine() || downHistory() && viFirstNonBlank();
     }
 
     protected boolean upLine() {
@@ -3175,8 +3252,7 @@ protected boolean viChangeWholeLine() {
     }
 
     protected boolean viChangeEol() {
-        return viChange(buf.cursor(), buf.length())
-                && setKeyMap(VIINS);
+        return viChange(buf.cursor(), buf.length()) && setKeyMap(VIINS);
     }
 
     protected boolean viKillEol() {
@@ -3199,7 +3275,8 @@ protected boolean quotedInsert() {
 
     protected boolean viJoin() {
         if (buf.down()) {
-            while (buf.move(-1) == -1 && buf.prevChar() != '\n') ;
+            while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+                ;
             buf.backspace();
             buf.write(' ');
             buf.move(-1);
@@ -3253,14 +3330,16 @@ protected boolean viEndOfLine() {
 
     protected boolean beginningOfLine() {
         while (count-- > 0) {
-            while (buf.move(-1) == -1 && buf.prevChar() != '\n') ;
+            while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+                ;
         }
         return true;
     }
 
     protected boolean endOfLine() {
         while (count-- > 0) {
-            while (buf.move(1) == 1 && buf.currChar() != '\n') ;
+            while (buf.move(1) == 1 && buf.currChar() != '\n')
+                ;
         }
         return true;
     }
@@ -3384,7 +3463,7 @@ protected boolean doViDeleteOrChange(int startPos, int endPos, boolean isChange)
         // what is really happening is that if we are in "move-mode" then the
         // cursor can't be moved off the end of the line, but in "edit-mode" it
         // is ok, but I have no easy way of knowing which mode we are in.
-        if (! isChange && startPos > 0 && startPos == buf.length()) {
+        if (!isChange && startPos > 0 && startPos == buf.length()) {
             buf.move(-1);
         }
         return true;
@@ -3424,14 +3503,16 @@ protected boolean viYankTo(int startPos, int endPos) {
     }
 
     protected boolean viOpenLineAbove() {
-        while (buf.move(-1) == -1 && buf.prevChar() != '\n') ;
+        while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+            ;
         buf.write('\n');
         buf.move(-1);
         return setKeyMap(VIINS);
     }
 
     protected boolean viOpenLineBelow() {
-        while (buf.move(1) == 1 && buf.currChar() != '\n') ;
+        while (buf.move(1) == 1 && buf.currChar() != '\n')
+            ;
         buf.write('\n');
         return setKeyMap(VIINS);
     }
@@ -3443,11 +3524,12 @@ protected boolean viOpenLineBelow() {
      */
     protected boolean viPutAfter() {
         if (yankBuffer.indexOf('\n') >= 0) {
-            while (buf.move(1) == 1 && buf.currChar() != '\n');
+            while (buf.move(1) == 1 && buf.currChar() != '\n')
+                ;
             buf.move(1);
             putString(yankBuffer);
-            buf.move(- yankBuffer.length());
-        } else if (yankBuffer.length () != 0) {
+            buf.move(-yankBuffer.length());
+        } else if (yankBuffer.length() != 0) {
             if (buf.cursor() < buf.length()) {
                 buf.move(1);
             }
@@ -3461,10 +3543,11 @@ protected boolean viPutAfter() {
 
     protected boolean viPutBefore() {
         if (yankBuffer.indexOf('\n') >= 0) {
-            while (buf.move(-1) == -1 && buf.prevChar() != '\n');
+            while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+                ;
             putString(yankBuffer);
-            buf.move(- yankBuffer.length());
-        } else if (yankBuffer.length () != 0) {
+            buf.move(-yankBuffer.length());
+        } else if (yankBuffer.length() != 0) {
             if (buf.cursor() > 0) {
                 buf.move(-1);
             }
@@ -3681,7 +3764,7 @@ protected Map<String, Widget> builtinWidgets() {
         addBuiltinWidget(widgets, MENU_EXPAND_OR_COMPLETE, this::menuExpandOrComplete);
         addBuiltinWidget(widgets, NEG_ARGUMENT, this::negArgument);
         addBuiltinWidget(widgets, OVERWRITE_MODE, this::overwriteMode);
-//        addBuiltinWidget(widgets, QUIT, this::quit);
+        //        addBuiltinWidget(widgets, QUIT, this::quit);
         addBuiltinWidget(widgets, QUOTED_INSERT, this::quotedInsert);
         addBuiltinWidget(widgets, REDISPLAY, this::redisplay);
         addBuiltinWidget(widgets, REDRAW_LINE, this::redrawLine);
@@ -3774,6 +3857,7 @@ private Widget namedWidget(String name, Widget widget) {
             public String toString() {
                 return name;
             }
+
             @Override
             public boolean apply() {
                 return widget.apply();
@@ -3797,14 +3881,11 @@ protected void redisplay(boolean flush) {
 
             Status status = Status.getStatus(terminal, false);
             if (status != null) {
-                if (terminal.getType().startsWith(AbstractWindowsTerminal.TYPE_WINDOWS)) {
-                    status.resize();
-                }
                 status.redraw();
             }
 
             if (size.getRows() > 0 && size.getRows() < MIN_ROWS) {
-                AttributedStringBuilder sb = new AttributedStringBuilder().tabs(TAB_WIDTH);
+                AttributedStringBuilder sb = new AttributedStringBuilder().tabs(getTabWidth());
 
                 sb.append(prompt);
                 concat(getHighlightedBuffer(buf.toString()).columnSplitLength(Integer.MAX_VALUE), sb);
@@ -3877,14 +3958,15 @@ protected void redisplay(boolean flush) {
             int cursorNewLinesId = -1;
             int cursorColPos = -1;
             if (size.getColumns() > 0) {
-                AttributedStringBuilder sb = new AttributedStringBuilder().tabs(TAB_WIDTH);
+                AttributedStringBuilder sb = new AttributedStringBuilder().tabs(getTabWidth());
                 sb.append(prompt);
                 String buffer = buf.upToCursor();
                 if (maskingCallback != null) {
                     buffer = maskingCallback.display(buffer);
                 }
                 sb.append(insertSecondaryPrompts(new AttributedString(buffer), secondaryPrompts, false));
-                List<AttributedString> promptLines = sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
+                List<AttributedString> promptLines =
+                        sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
                 if (!promptLines.isEmpty()) {
                     cursorNewLinesId = promptLines.size() - 1;
                     cursorColPos = promptLines.get(promptLines.size() - 1).columnLength();
@@ -3904,7 +3986,7 @@ protected void redisplay(boolean flush) {
                 int lineId = newLines.size() - displaySize + 1;
                 int endId = displaySize;
                 int startId = 1;
-                if (lineId  > cursorNewLinesId) {
+                if (lineId > cursorNewLinesId) {
                     lineId = cursorNewLinesId;
                     endId = displaySize - 1;
                     startId = 0;
@@ -3949,10 +4031,9 @@ private String matchPreviousCommand(String buffer) {
         }
         History history = getHistory();
         StringBuilder sb = new StringBuilder();
-        for (char c: buffer.replace("\\", "\\\\").toCharArray()) {
-            if (c == '(' || c == ')' || c == '[' || c == ']' || c == '{' || c == '}' || c == '^' || c == '*'
-                     || c == '$' || c == '.' || c == '?' || c == '+' || c == '|' || c == '<' || c == '>' || c == '!'
-                     || c == '-') {
+        for (char c : buffer.replace("\\", "\\\\").toCharArray()) {
+            if (c == '(' || c == ')' || c == '[' || c == ']' || c == '{' || c == '}' || c == '^' || c == '*' || c == '$'
+                    || c == '.' || c == '?' || c == '+' || c == '|' || c == '<' || c == '>' || c == '!' || c == '-') {
                 sb.append('\\');
             }
             sb.append(c);
@@ -3984,7 +4065,7 @@ public AttributedString getDisplayedBufferWithPrompts(List<AttributedString> sec
         AttributedString attBuf = getHighlightedBuffer(buf.toString());
 
         AttributedString tNewBuf = insertSecondaryPrompts(attBuf, secondaryPrompts);
-        AttributedStringBuilder full = new AttributedStringBuilder().tabs(TAB_WIDTH);
+        AttributedStringBuilder full = new AttributedStringBuilder().tabs(getTabWidth());
         full.append(prompt);
         full.append(tNewBuf);
         if (doAutosuggestion && !isTerminalDumb()) {
@@ -4040,15 +4121,15 @@ private AttributedString getHighlightedBuffer(String buffer) {
         if (maskingCallback != null) {
             buffer = maskingCallback.display(buffer);
         }
-        if (highlighter != null && !isSet(Option.DISABLE_HIGHLIGHTER)
+        if (highlighter != null
+                && !isSet(Option.DISABLE_HIGHLIGHTER)
                 && buffer.length() < getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE)) {
             return highlighter.highlight(this, buffer);
         }
         return new AttributedString(buffer);
     }
 
-    private AttributedString expandPromptPattern(String pattern, int padToWidth,
-                                                 String message, int line) {
+    private AttributedString expandPromptPattern(String pattern, int padToWidth, String message, int line) {
         ArrayList<AttributedString> parts = new ArrayList<>();
         boolean isHidden = false;
         int padPartIndex = -1;
@@ -4065,7 +4146,8 @@ private AttributedString expandPromptPattern(String pattern, int padToWidth,
             if (ch == '%' && i < plen) {
                 int count = 0;
                 boolean countSeen = false;
-                decode: while (true) {
+                decode:
+                while (true) {
                     ch = pattern.charAt(i++);
                     switch (ch) {
                         case '{':
@@ -4073,7 +4155,7 @@ private AttributedString expandPromptPattern(String pattern, int padToWidth,
                             String str = sb.toString();
                             AttributedString astr;
                             if (!isHidden) {
-                                astr = AttributedString.fromAnsi(str);
+                                astr = fromAnsi(str);
                                 cols += astr.columnLength();
                             } else {
                                 astr = new AttributedString(str, AttributedStyle.HIDDEN);
@@ -4096,12 +4178,10 @@ private AttributedString expandPromptPattern(String pattern, int padToWidth,
                             sb.append(getInt(LINE_OFFSET, 0) + line);
                             break decode;
                         case 'M':
-                            if (message != null)
-                                sb.append(message);
+                            if (message != null) sb.append(message);
                             break decode;
                         case 'P':
-                            if (countSeen && count >= 0)
-                                padToWidth = count;
+                            if (countSeen && count >= 0) padToWidth = count;
                             if (i < plen) {
                                 padChar = pattern.charAt(i++);
                                 // FIXME check surrogate
@@ -4140,25 +4220,28 @@ private AttributedString expandPromptPattern(String pattern, int padToWidth,
                             break decode;
                     }
                 }
-            } else
-                sb.append(ch);
+            } else sb.append(ch);
         }
         if (padToWidth > cols && padToWidth > 0) {
             int padCharCols = WCWidth.wcwidth(padChar);
             int padCount = (padToWidth - cols) / padCharCols;
             sb = padPartString;
-            while (--padCount >= 0)
-                sb.insert(padPos, (char) padChar); // FIXME if wide
-            parts.set(padPartIndex, AttributedString.fromAnsi(sb.toString()));
+            while (--padCount >= 0) sb.insert(padPos, (char) padChar); // FIXME if wide
+            parts.set(padPartIndex, fromAnsi(sb.toString()));
         }
         return AttributedString.join(null, parts);
     }
 
+    private AttributedString fromAnsi(String str) {
+        return AttributedString.fromAnsi(str, Collections.singletonList(0), alternateIn, alternateOut);
+    }
+
     private AttributedString insertSecondaryPrompts(AttributedString str, List<AttributedString> prompts) {
         return insertSecondaryPrompts(str, prompts, true);
     }
 
-    private AttributedString insertSecondaryPrompts(AttributedString strAtt, List<AttributedString> prompts, boolean computePrompts) {
+    private AttributedString insertSecondaryPrompts(
+            AttributedString strAtt, List<AttributedString> prompts, boolean computePrompts) {
         Objects.requireNonNull(prompts);
         List<AttributedString> lines = strAtt.columnSplitLength(Integer.MAX_VALUE);
         AttributedStringBuilder sb = new AttributedStringBuilder();
@@ -4171,7 +4254,9 @@ private AttributedString insertSecondaryPrompts(AttributedString strAtt, List<At
         if (computePrompts && secondaryPromptPattern.contains("%P")) {
             width = prompt.columnLength();
             if (width > size.getColumns() || prompt.contains('\n')) {
-                width = new TerminalLine(prompt.toString(), 0, size.getColumns()).getEndLine().length();
+                width = new TerminalLine(prompt.toString(), 0, size.getColumns())
+                        .getEndLine()
+                        .length();
             }
             for (int line = 0; line < lines.size() - 1; line++) {
                 AttributedString prompt;
@@ -4227,11 +4312,9 @@ private AttributedString insertSecondaryPrompts(AttributedString strAtt, List<At
 
     private AttributedString addRightPrompt(AttributedString prompt, AttributedString line) {
         int width = prompt.columnLength();
-        boolean endsWithNl = line.length() > 0
-            && line.charAt(line.length() - 1) == '\n';
+        boolean endsWithNl = line.length() > 0 && line.charAt(line.length() - 1) == '\n';
         // columnLength counts -1 for the final newline; adjust for that
-        int nb = size.getColumns() - width
-            - (line.columnLength() + (endsWithNl ? 1 : 0));
+        int nb = size.getColumns() - width - (line.columnLength() + (endsWithNl ? 1 : 0));
         if (nb >= 3) {
             AttributedStringBuilder sb = new AttributedStringBuilder(size.getColumns());
             sb.append(line, 0, endsWithNl ? line.length() - 1 : line.length());
@@ -4253,8 +4336,8 @@ private AttributedString addRightPrompt(AttributedString prompt, AttributedStrin
 
     protected boolean insertTab() {
         return isSet(Option.INSERT_TAB)
-                    && getLastBinding().equals("\t")
-                    && buf.toString().matches("(^|[\\s\\S]*\n)[\r\n\t ]*");
+                && getLastBinding().equals("\t")
+                && buf.toString().matches("(^|[\\s\\S]*\n)[\r\n\t ]*");
     }
 
     protected boolean expandHistory() {
@@ -4465,7 +4548,8 @@ else if (isSet(Option.RECOGNIZE_EXACT)) {
                     if (op != null) {
                         String chars = getString(REMOVE_SUFFIX_CHARS, DEFAULT_REMOVE_SUFFIX_CHARS);
                         String ref = op instanceof Reference ? ((Reference) op).name() : null;
-                        if (SELF_INSERT.equals(ref) && chars.indexOf(getLastBinding().charAt(0)) >= 0
+                        if (SELF_INSERT.equals(ref)
+                                        && chars.indexOf(getLastBinding().charAt(0)) >= 0
                                 || ACCEPT_LINE.equals(ref)) {
                             buf.backspace(completion.suffix().length());
                             if (getLastBinding().charAt(0) != ' ') {
@@ -4533,27 +4617,35 @@ protected static CompletingParsedLine wrap(ParsedLine line) {
                 public String word() {
                     return line.word();
                 }
+
                 public int wordCursor() {
                     return line.wordCursor();
                 }
+
                 public int wordIndex() {
                     return line.wordIndex();
                 }
+
                 public List<String> words() {
                     return line.words();
                 }
+
                 public String line() {
                     return line.line();
                 }
+
                 public int cursor() {
                     return line.cursor();
                 }
+
                 public CharSequence escape(CharSequence candidate, boolean complete) {
                     return candidate;
                 }
+
                 public int rawWordCursor() {
                     return wordCursor();
                 }
+
                 public int rawWordLength() {
                     return word().length();
                 }
@@ -4564,8 +4656,7 @@ public int rawWordLength() {
     protected Comparator<Candidate> getCandidateComparator(boolean caseInsensitive, String word) {
         String wdi = caseInsensitive ? word.toLowerCase() : word;
         ToIntFunction<String> wordDistance = w -> ReaderUtils.distance(wdi, caseInsensitive ? w.toLowerCase() : w);
-        return Comparator
-                .comparing(Candidate::value, Comparator.comparingInt(wordDistance))
+        return Comparator.comparing(Candidate::value, Comparator.comparingInt(wordDistance))
                 .thenComparing(Comparator.naturalOrder());
     }
 
@@ -4577,9 +4668,10 @@ protected String getOriginalGroupName() {
         return getString(ORIGINAL_GROUP_NAME, DEFAULT_ORIGINAL_GROUP_NAME);
     }
 
-
     protected Comparator<String> getGroupComparator() {
-        return Comparator.<String>comparingInt(s -> getOthersGroupName().equals(s) ? 1 : getOriginalGroupName().equals(s) ? -1 : 0)
+        return Comparator.<String>comparingInt(s -> getOthersGroupName().equals(s)
+                        ? 1
+                        : getOriginalGroupName().equals(s) ? -1 : 0)
                 .thenComparing(String::toLowerCase, Comparator.naturalOrder());
     }
 
@@ -4600,11 +4692,9 @@ private void mergeCandidates(List<Candidate> possible) {
                     // the same description
                     candidates.sort(Comparator.comparing(Candidate::value));
                     Candidate first = candidates.get(0);
-                    String disp = candidates.stream()
-                            .map(Candidate::displ)
-                            .collect(Collectors.joining(" "));
-                    possible.add(new Candidate(first.value(), disp, first.group(),
-                            first.descr(), first.suffix(), null, first.complete()));
+                    String disp = candidates.stream().map(Candidate::displ).collect(Collectors.joining(" "));
+                    possible.add(new Candidate(
+                            first.value(), disp, first.group(), first.descr(), first.suffix(), null, first.complete()));
                 }
             }
         }
@@ -4636,8 +4726,10 @@ private int visibleDisplayRows() {
     }
 
     private int promptLines() {
-        AttributedString text = insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
-        return text.columnSplitLength(size.getColumns(), false, display.delayLineWrap()).size();
+        AttributedString text =
+                insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
+        return text.columnSplitLength(size.getColumns(), false, display.delayLineWrap())
+                .size();
     }
 
     private class MenuSupport implements Supplier<AttributedString> {
@@ -4651,7 +4743,8 @@ private class MenuSupport implements Supplier<AttributedString> {
         int columns;
         String completed;
 
-        public MenuSupport(List<Candidate> original, String completed, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
+        public MenuSupport(
+                List<Candidate> original, String completed, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
             this.possible = new ArrayList<>();
             this.escaper = escaper;
             this.selection = -1;
@@ -4714,7 +4807,7 @@ private void minor(int step) {
             if (selection - row + axis > options) {
                 // selection is the last row/column
                 // so there are fewer options than other rows
-                axis = options%axis;
+                axis = options % axis;
             }
             selection = selection - row + ((axis + row + step) % axis);
             update();
@@ -4772,7 +4865,9 @@ private void update() {
                 AttributedString post = pr.post;
                 if (post.length() > 0 && post.charAt(post.length() - 1) != '\n') {
                     post = new AttributedStringBuilder(post.length() + 1)
-                            .append(post).append("\n").toAttributedString();
+                            .append(post)
+                            .append("\n")
+                            .toAttributedString();
                 }
                 List<AttributedString> lines = post.columnSplitLength(size.getColumns(), true, display.delayLineWrap());
                 List<AttributedString> sub = new ArrayList<>(lines.subList(topLine, topLine + displayed));
@@ -4785,7 +4880,8 @@ private void update() {
                         .append(" of ")
                         .append(Integer.toString(lines.size()))
                         .append("\n")
-                        .style(AttributedStyle.DEFAULT).toAttributedString());
+                        .style(AttributedStyle.DEFAULT)
+                        .toAttributedString());
                 computed = AttributedString.join(AttributedString.EMPTY, sub);
             } else {
                 computed = pr.post;
@@ -4798,10 +4894,10 @@ private void update() {
         public AttributedString get() {
             return computed;
         }
-
     }
 
-    protected boolean doMenu(List<Candidate> original, String completed, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
+    protected boolean doMenu(
+            List<Candidate> original, String completed, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
         // Reorder candidates according to display order
         final List<Candidate> possible = new ArrayList<>();
         boolean caseInsensitive = isSet(Option.CASE_INSENSITIVE);
@@ -4854,7 +4950,7 @@ protected boolean doMenu(List<Candidate> original, String completed, BiFunction<
                     if (completion.suffix() != null) {
                         String chars = getString(REMOVE_SUFFIX_CHARS, DEFAULT_REMOVE_SUFFIX_CHARS);
                         if (SELF_INSERT.equals(ref)
-                                && chars.indexOf(getLastBinding().charAt(0)) >= 0
+                                        && chars.indexOf(getLastBinding().charAt(0)) >= 0
                                 || BACKWARD_DELETE_CHAR.equals(ref)) {
                             buf.backspace(completion.suffix().length());
                         }
@@ -4866,8 +4962,8 @@ && getLastBinding().charAt(0) != ' '
                     }
                     if (!ACCEPT_LINE.equals(ref)
                             && !(SELF_INSERT.equals(ref)
-                                && completion.suffix() != null
-                                && completion.suffix().startsWith(getLastBinding()))) {
+                                    && completion.suffix() != null
+                                    && completion.suffix().startsWith(getLastBinding()))) {
                         pushBackBinding(true);
                     }
                     post = null;
@@ -4888,29 +4984,40 @@ protected boolean clearChoices() {
         return doList(new ArrayList<>(), "", false, null, false);
     }
 
-    protected boolean doList(List<Candidate> possible
-                           , String completed, boolean runLoop, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
+    protected boolean doList(
+            List<Candidate> possible,
+            String completed,
+            boolean runLoop,
+            BiFunction<CharSequence, Boolean, CharSequence> escaper) {
         return doList(possible, completed, runLoop, escaper, false);
     }
 
-    protected boolean doList(List<Candidate> possible
-                           , String completed
-                           , boolean runLoop, BiFunction<CharSequence, Boolean, CharSequence> escaper, boolean forSuggestion) {
+    protected boolean doList(
+            List<Candidate> possible,
+            String completed,
+            boolean runLoop,
+            BiFunction<CharSequence, Boolean, CharSequence> escaper,
+            boolean forSuggestion) {
         // If we list only and if there's a big
         // number of items, we should ask the user
         // for confirmation, display the list
         // and redraw the line at the bottom
         mergeCandidates(possible);
-        AttributedString text = insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
-        int promptLines = text.columnSplitLength(size.getColumns(), false, display.delayLineWrap()).size();
+        AttributedString text =
+                insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
+        int promptLines = text.columnSplitLength(size.getColumns(), false, display.delayLineWrap())
+                .size();
         PostResult postResult = computePost(possible, null, null, completed);
         int lines = postResult.lines;
         int listMax = getInt(LIST_MAX, DEFAULT_LIST_MAX);
-        if (listMax > 0 && possible.size() >= listMax
-                || lines >= size.getRows() - promptLines) {
+        int possibleSize = possible.size();
+        if (possibleSize == 0 || size.getRows() == 0) {
+            return false;
+        }
+        if (listMax > 0 && possibleSize >= listMax || lines >= size.getRows() - promptLines) {
             if (!forSuggestion) {
                 // prompt
-                post = () -> new AttributedString(getAppName() + ": do you wish to see all " + possible.size()
+                post = () -> new AttributedString(getAppName() + ": do you wish to see all " + possibleSize
                         + " possibilities (" + lines + " lines)?");
                 redisplay(true);
                 int c = readCharacter();
@@ -4930,8 +5037,7 @@ protected boolean doList(List<Candidate> possible
             String current = completed + sb.toString();
             List<Candidate> cands;
             if (sb.length() > 0) {
-                completionMatcher.compile(options, false, new CompletingWord(current), caseInsensitive, 0
-                        , null);
+                completionMatcher.compile(options, false, new CompletingWord(current), caseInsensitive, 0, null);
                 cands = completionMatcher.matches(possible).stream()
                         .sorted(getCandidateComparator(caseInsensitive, current))
                         .collect(Collectors.toList());
@@ -4944,8 +5050,10 @@ protected boolean doList(List<Candidate> possible
                 candidateStartPosition = candidateStartPosition(cands);
             }
             post = () -> {
-                AttributedString t = insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
-                int pl = t.columnSplitLength(size.getColumns(), false, display.delayLineWrap()).size();
+                AttributedString t = insertSecondaryPrompts(
+                        AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
+                int pl = t.columnSplitLength(size.getColumns(), false, display.delayLineWrap())
+                        .size();
                 PostResult pr = computePost(cands, null, null, current);
                 if (pr.lines >= size.getRows() - pl) {
                     post = null;
@@ -4954,7 +5062,8 @@ protected boolean doList(List<Candidate> possible
                     redisplay(false);
                     buf.cursor(oldCursor);
                     println();
-                    List<AttributedString> ls = pr.post.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
+                    List<AttributedString> ls =
+                            pr.post.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
                     Display d = new Display(terminal, false);
                     d.resize(size.getRows(), size.getColumns());
                     d.update(ls, -1);
@@ -5074,25 +5183,41 @@ public PostResult(AttributedString post, int lines, int selectedLine) {
         }
     }
 
-    protected PostResult computePost(List<Candidate> possible, Candidate selection, List<Candidate> ordered, String completed) {
-        return computePost(possible, selection, ordered, completed, display::wcwidth, size.getColumns(), isSet(Option.AUTO_GROUP), isSet(Option.GROUP), isSet(Option.LIST_ROWS_FIRST));
-    }
-
-    protected PostResult computePost(List<Candidate> possible, Candidate selection, List<Candidate> ordered, String completed, Function<String, Integer> wcwidth, int width, boolean autoGroup, boolean groupName, boolean rowsFirst) {
+    protected PostResult computePost(
+            List<Candidate> possible, Candidate selection, List<Candidate> ordered, String completed) {
+        return computePost(
+                possible,
+                selection,
+                ordered,
+                completed,
+                display::wcwidth,
+                size.getColumns(),
+                isSet(Option.AUTO_GROUP),
+                isSet(Option.GROUP),
+                isSet(Option.LIST_ROWS_FIRST));
+    }
+
+    protected PostResult computePost(
+            List<Candidate> possible,
+            Candidate selection,
+            List<Candidate> ordered,
+            String completed,
+            Function<String, Integer> wcwidth,
+            int width,
+            boolean autoGroup,
+            boolean groupName,
+            boolean rowsFirst) {
         List<Object> strings = new ArrayList<>();
-        boolean customOrder = possible.stream().anyMatch(c -> c.sort() != 0);
         if (groupName) {
             Comparator<String> groupComparator = getGroupComparator();
-            Map<String, Map<Object, Candidate>> sorted;
-            sorted = groupComparator != null
-                        ? new TreeMap<>(groupComparator)
-                        : new LinkedHashMap<>();
+            Map<String, List<Candidate>> sorted;
+            sorted = groupComparator != null ? new TreeMap<>(groupComparator) : new LinkedHashMap<>();
             for (Candidate cand : possible) {
                 String group = cand.group();
-                sorted.computeIfAbsent(group != null ? group : "", s -> new LinkedHashMap<>())
-                        .put((customOrder ? cand.sort() : cand.value()), cand);
+                sorted.computeIfAbsent(group != null ? group : "", s -> new ArrayList<>())
+                        .add(cand);
             }
-            for (Map.Entry<String, Map<Object, Candidate>> entry : sorted.entrySet()) {
+            for (Map.Entry<String, List<Candidate>> entry : sorted.entrySet()) {
                 String group = entry.getKey();
                 if (group.isEmpty() && sorted.size() > 1) {
                     group = getOthersGroupName();
@@ -5100,27 +5225,30 @@ protected PostResult computePost(List<Candidate> possible, Candidate selection,
                 if (!group.isEmpty() && autoGroup) {
                     strings.add(group);
                 }
-                strings.add(new ArrayList<>(entry.getValue().values()));
+                List<Candidate> candidates = entry.getValue();
+                Collections.sort(candidates);
+                strings.add(candidates);
                 if (ordered != null) {
-                    ordered.addAll(entry.getValue().values());
+                    ordered.addAll(candidates);
                 }
             }
         } else {
             Set<String> groups = new LinkedHashSet<>();
-            TreeMap<Object, Candidate> sorted = new TreeMap<>();
+            List<Candidate> sorted = new ArrayList<>();
             for (Candidate cand : possible) {
                 String group = cand.group();
                 if (group != null) {
                     groups.add(group);
                 }
-                sorted.put((customOrder ? cand.sort() : cand.value()), cand);
+                sorted.add(cand);
             }
             if (autoGroup) {
                 strings.addAll(groups);
             }
-            strings.add(new ArrayList<>(sorted.values()));
+            Collections.sort(sorted);
+            strings.add(sorted);
             if (ordered != null) {
-                ordered.addAll(sorted.values());
+                ordered.addAll(sorted);
             }
         }
         return toColumns(strings, selection, completed, wcwidth, width, rowsFirst);
@@ -5163,12 +5291,15 @@ public String getEndLine() {
     }
 
     private int candidateStartPosition(List<Candidate> cands) {
-        List<String> values = cands.stream().map(c -> AttributedString.stripAnsi(c.displ()))
-                .filter(c -> !c.matches("\\w+") && c.length() > 1).collect(Collectors.toList());
+        List<String> values = cands.stream()
+                .map(c -> AttributedString.stripAnsi(c.displ()))
+                .filter(c -> !c.matches("\\w+") && c.length() > 1)
+                .collect(Collectors.toList());
         Set<String> notDelimiters = new HashSet<>();
-        values.forEach(v -> v.substring(0, v.length() - 1).chars()
+        values.forEach(v -> v.substring(0, v.length() - 1)
+                .chars()
                 .filter(c -> !Character.isDigit(c) && !Character.isAlphabetic(c))
-                .forEach(c -> notDelimiters.add(Character.toString((char)c))));
+                .forEach(c -> notDelimiters.add(Character.toString((char) c))));
         int width = size.getColumns();
         int promptLength = prompt != null ? prompt.length() : 0;
         if (promptLength > 0) {
@@ -5179,8 +5310,7 @@ private int candidateStartPosition(List<Candidate> cands) {
         int out = tl.getStartPos();
         String buffer = tl.getEndLine();
         for (int i = buffer.length(); i > 0; i--) {
-            if (buffer.substring(0, i).matches(".*\\W")
-                    && !notDelimiters.contains(buffer.substring(i - 1, i))) {
+            if (buffer.substring(0, i).matches(".*\\W") && !notDelimiters.contains(buffer.substring(i - 1, i))) {
                 out += i;
                 break;
             }
@@ -5189,7 +5319,13 @@ private int candidateStartPosition(List<Candidate> cands) {
     }
 
     @SuppressWarnings("unchecked")
-    protected PostResult toColumns(List<Object> items, Candidate selection, String completed, Function<String, Integer> wcwidth, int width, boolean rowsFirst) {
+    protected PostResult toColumns(
+            List<Object> items,
+            Candidate selection,
+            String completed,
+            Function<String, Integer> wcwidth,
+            int width,
+            boolean rowsFirst) {
         int[] out = new int[2];
         // TODO: support Option.LIST_PACKED
         // Compute column width
@@ -5199,8 +5335,7 @@ protected PostResult toColumns(List<Object> items, Candidate selection, String c
             if (item instanceof String) {
                 int len = wcwidth.apply((String) item);
                 maxWidth = Math.max(maxWidth, len);
-            }
-            else if (item instanceof List) {
+            } else if (item instanceof List) {
                 for (Candidate cand : (List<Candidate>) item) {
                     listSize++;
                     int len = wcwidth.apply(cand.displ());
@@ -5218,7 +5353,10 @@ else if (item instanceof List) {
         AttributedStringBuilder sb = new AttributedStringBuilder();
         if (listSize > 0) {
             if (isSet(Option.AUTO_MENU_LIST)
-                    && listSize < Math.min(getInt(MENU_LIST_MAX, DEFAULT_MENU_LIST_MAX), visibleDisplayRows() - promptLines())) {
+                    && listSize
+                            < Math.min(
+                                    getInt(MENU_LIST_MAX, DEFAULT_MENU_LIST_MAX),
+                                    visibleDisplayRows() - promptLines())) {
                 maxWidth = Math.max(maxWidth, MENU_LIST_WIDTH);
                 sb.tabs(Math.max(Math.min(candidateStartPosition, width - maxWidth - 1), 1));
                 width = maxWidth + 2;
@@ -5251,8 +5389,16 @@ else if (item instanceof List) {
     }
 
     @SuppressWarnings("unchecked")
-    protected void toColumns(Object items, int width, int maxWidth, AttributedStringBuilder sb, Candidate selection, String completed
-                           , boolean rowsFirst, boolean doMenuList, int[] out) {
+    protected void toColumns(
+            Object items,
+            int width,
+            int maxWidth,
+            AttributedStringBuilder sb,
+            Candidate selection,
+            String completed,
+            boolean rowsFirst,
+            boolean doMenuList,
+            int[] out) {
         if (maxWidth <= 0 || width <= 0) {
             return;
         }
@@ -5305,18 +5451,20 @@ else if (items instanceof List) {
                     if (idx < candidates.size()) {
                         Candidate cand = candidates.get(idx);
                         boolean hasRightItem = j < columns - 1 && index.applyAsInt(i, j + 1) < candidates.size();
-                        AttributedString left = AttributedString.fromAnsi(cand.displ());
-                        AttributedString right = AttributedString.fromAnsi(cand.descr());
+                        AttributedString left = fromAnsi(cand.displ());
+                        AttributedString right = fromAnsi(cand.descr());
                         int lw = left.columnLength();
                         int rw = 0;
                         if (right != null) {
-                            int rem = maxWidth - (lw + MARGIN_BETWEEN_DISPLAY_AND_DESC
-                                    + DESC_PREFIX.length() + DESC_SUFFIX.length());
+                            int rem = maxWidth
+                                    - (lw
+                                            + MARGIN_BETWEEN_DISPLAY_AND_DESC
+                                            + DESC_PREFIX.length()
+                                            + DESC_SUFFIX.length());
                             rw = right.columnLength();
                             if (rw > rem) {
                                 right = AttributedStringBuilder.append(
-                                            right.columnSubSequence(0, rem - WCWidth.wcwidth('\u2026')),
-                                            "\u2026");
+                                        right.columnSubSequence(0, rem - WCWidth.wcwidth('\u2026')), "\u2026");
                                 rw = right.columnLength();
                             }
                             right = AttributedStringBuilder.append(DESC_PREFIX, right, DESC_SUFFIX);
@@ -5325,8 +5473,9 @@ else if (items instanceof List) {
                         if (cand == selection) {
                             out[1] = i;
                             asb.style(getCompletionStyleSelection(doMenuList));
-                            if (left.toString().regionMatches(
-                                    isSet(Option.CASE_INSENSITIVE), 0, completed, 0, completed.length())) {
+                            if (left.toString()
+                                    .regionMatches(
+                                            isSet(Option.CASE_INSENSITIVE), 0, completed, 0, completed.length())) {
                                 asb.append(left.toString(), 0, completed.length());
                                 asb.append(left.toString(), completed.length(), left.length());
                             } else {
@@ -5340,8 +5489,9 @@ else if (items instanceof List) {
                             }
                             asb.style(AttributedStyle.DEFAULT);
                         } else {
-                            if (left.toString().regionMatches(
-                                    isSet(Option.CASE_INSENSITIVE), 0, completed, 0, completed.length())) {
+                            if (left.toString()
+                                    .regionMatches(
+                                            isSet(Option.CASE_INSENSITIVE), 0, completed, 0, completed.length())) {
                                 asb.style(getCompletionStyleStarting(doMenuList));
                                 asb.append(left, 0, completed.length());
                                 asb.style(AttributedStyle.DEFAULT);
@@ -5447,7 +5597,7 @@ protected AttributedStyle getCompletionStyle(String name, String value) {
     }
 
     protected AttributedStyle buildStyle(String str) {
-        return AttributedString.fromAnsi("\u001b[" + str + "m ").styleAt(0);
+        return fromAnsi("\u001b[" + str + "m ").styleAt(0);
     }
 
     /**
@@ -5477,14 +5627,14 @@ protected boolean moveHistory(final boolean next) {
         }
         if (next && !history.next()) {
             return false;
-        }
-        else if (!next && !history.previous()) {
+        } else if (!next && !history.previous()) {
             return false;
         }
 
-        setBuffer(modifiedHistory.containsKey(history.index())
-                    ? modifiedHistory.get(history.index())
-                    : history.current());
+        setBuffer(
+                modifiedHistory.containsKey(history.index())
+                        ? modifiedHistory.get(history.index())
+                        : history.current());
 
         return true;
     }
@@ -5515,7 +5665,6 @@ void println() {
         redrawLine();
     }
 
-
     //
     // Actions
     //
@@ -5725,8 +5874,7 @@ public boolean yankPop() {
 
     public boolean mouse() {
         MouseEvent event = readMouseEvent();
-        if (event.getType() == MouseEvent.Type.Released
-                && event.getButton() == MouseEvent.Button.Button1) {
+        if (event.getType() == MouseEvent.Type.Released && event.getButton() == MouseEvent.Button.Button1) {
             StringBuilder tsb = new StringBuilder();
             Cursor cursor = terminal.getCursorPosition(c -> tsb.append((char) c));
             bindingReader.runMacro(tsb.toString());
@@ -5734,15 +5882,20 @@ public boolean mouse() {
             List<AttributedString> secondaryPrompts = new ArrayList<>();
             getDisplayedBufferWithPrompts(secondaryPrompts);
 
-            AttributedStringBuilder sb = new AttributedStringBuilder().tabs(TAB_WIDTH);
+            AttributedStringBuilder sb = new AttributedStringBuilder().tabs(getTabWidth());
             sb.append(prompt);
             sb.append(insertSecondaryPrompts(new AttributedString(buf.upToCursor()), secondaryPrompts, false));
-            List<AttributedString> promptLines = sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
+            List<AttributedString> promptLines =
+                    sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
 
             int currentLine = promptLines.size() - 1;
             int wantedLine = Math.max(0, Math.min(currentLine + event.getY() - cursor.getY(), secondaryPrompts.size()));
-            int pl0 = currentLine == 0 ? prompt.columnLength() : secondaryPrompts.get(currentLine - 1).columnLength();
-            int pl1 = wantedLine == 0 ? prompt.columnLength() : secondaryPrompts.get(wantedLine - 1).columnLength();
+            int pl0 = currentLine == 0
+                    ? prompt.columnLength()
+                    : secondaryPrompts.get(currentLine - 1).columnLength();
+            int pl1 = wantedLine == 0
+                    ? prompt.columnLength()
+                    : secondaryPrompts.get(wantedLine - 1).columnLength();
             int adjust = pl1 - pl0;
             buf.moveXY(event.getX() - cursor.getX() - adjust, event.getY() - cursor.getY());
         }
@@ -5814,13 +5967,11 @@ public boolean beep() {
                 bell_preference = BellType.VISIBLE;
                 break;
             case "on":
-                bell_preference = getBoolean(PREFER_VISIBLE_BELL, false)
-                        ? BellType.VISIBLE : BellType.AUDIBLE;
+                bell_preference = getBoolean(PREFER_VISIBLE_BELL, false) ? BellType.VISIBLE : BellType.AUDIBLE;
                 break;
         }
         if (bell_preference == BellType.VISIBLE) {
-            if (terminal.puts(Capability.flash_screen)
-                    || terminal.puts(Capability.bell)) {
+            if (terminal.puts(Capability.flash_screen) || terminal.puts(Capability.bell)) {
                 flush();
             }
         } else if (bell_preference == BellType.AUDIBLE) {
@@ -5869,8 +6020,7 @@ protected boolean isAlpha(int c) {
 
     protected boolean isWord(int c) {
         String wordchars = getString(WORDCHARS, DEFAULT_WORDCHARS);
-        return Character.isLetterOrDigit(c)
-                || (c < 128 && wordchars.indexOf((char) c) >= 0);
+        return Character.isLetterOrDigit(c) || (c < 128 && wordchars.indexOf((char) c) >= 0);
     }
 
     String getString(String name, String def) {
@@ -5899,6 +6049,8 @@ public Map<String, KeyMap<Binding>> defaultKeyMaps() {
         keyMaps.put(VIOPP, viOpp());
         keyMaps.put(VISUAL, visual());
         keyMaps.put(SAFE, safe());
+        keyMaps.put(DUMB, dumb());
+
         if (getBoolean(BIND_TTY_SPECIAL_CHARS, true)) {
             Attributes attr = terminal.getAttributes();
             bindConsoleChars(keyMaps.get(EMACS), attr);
@@ -5909,240 +6061,241 @@ public Map<String, KeyMap<Binding>> defaultKeyMaps() {
             keyMap.setUnicode(new Reference(SELF_INSERT));
             keyMap.setAmbiguousTimeout(getLong(AMBIGUOUS_BINDING, DEFAULT_AMBIGUOUS_BINDING));
         }
-        // By default, link main to emacs
-        keyMaps.put(MAIN, keyMaps.get(EMACS));
+        // By default, link main to emacs unless the temrinal is dumb
+        keyMaps.put(MAIN, keyMaps.get(isTerminalDumb() ? DUMB : EMACS));
+
         return keyMaps;
     }
 
     public KeyMap<Binding> emacs() {
         KeyMap<Binding> emacs = new KeyMap<>();
         bindKeys(emacs);
-        bind(emacs, SET_MARK_COMMAND,                       ctrl('@'));
-        bind(emacs, BEGINNING_OF_LINE,                      ctrl('A'));
-        bind(emacs, BACKWARD_CHAR,                          ctrl('B'));
-        bind(emacs, DELETE_CHAR_OR_LIST,                    ctrl('D'));
-        bind(emacs, END_OF_LINE,                            ctrl('E'));
-        bind(emacs, FORWARD_CHAR,                           ctrl('F'));
-        bind(emacs, SEND_BREAK,                             ctrl('G'));
-        bind(emacs, BACKWARD_DELETE_CHAR,                   ctrl('H'));
-        bind(emacs, EXPAND_OR_COMPLETE,                     ctrl('I'));
-        bind(emacs, ACCEPT_LINE,                            ctrl('J'));
-        bind(emacs, KILL_LINE,                              ctrl('K'));
-        bind(emacs, CLEAR_SCREEN,                           ctrl('L'));
-        bind(emacs, ACCEPT_LINE,                            ctrl('M'));
-        bind(emacs, DOWN_LINE_OR_HISTORY,                   ctrl('N'));
-        bind(emacs, ACCEPT_LINE_AND_DOWN_HISTORY,           ctrl('O'));
-        bind(emacs, UP_LINE_OR_HISTORY,                     ctrl('P'));
-        bind(emacs, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('R'));
-        bind(emacs, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('S'));
-        bind(emacs, TRANSPOSE_CHARS,                        ctrl('T'));
-        bind(emacs, KILL_WHOLE_LINE,                        ctrl('U'));
-        bind(emacs, QUOTED_INSERT,                          ctrl('V'));
-        bind(emacs, BACKWARD_KILL_WORD,                     ctrl('W'));
-        bind(emacs, YANK,                                   ctrl('Y'));
-        bind(emacs, CHARACTER_SEARCH,                       ctrl(']'));
-        bind(emacs, UNDO,                                   ctrl('_'));
-        bind(emacs, SELF_INSERT,                            range(" -~"));
-        bind(emacs, INSERT_CLOSE_PAREN,                     ")");
-        bind(emacs, INSERT_CLOSE_SQUARE,                    "]");
-        bind(emacs, INSERT_CLOSE_CURLY,                     "}");
-        bind(emacs, BACKWARD_DELETE_CHAR,                   del());
-        bind(emacs, VI_MATCH_BRACKET,                       translate("^X^B"));
-        bind(emacs, SEND_BREAK,                             translate("^X^G"));
-        bind(emacs, EDIT_AND_EXECUTE_COMMAND,               translate("^X^E"));
-        bind(emacs, VI_FIND_NEXT_CHAR,                      translate("^X^F"));
-        bind(emacs, VI_JOIN,                                translate("^X^J"));
-        bind(emacs, KILL_BUFFER,                            translate("^X^K"));
-        bind(emacs, INFER_NEXT_HISTORY,                     translate("^X^N"));
-        bind(emacs, OVERWRITE_MODE,                         translate("^X^O"));
-        bind(emacs, REDO,                                   translate("^X^R"));
-        bind(emacs, UNDO,                                   translate("^X^U"));
-        bind(emacs, VI_CMD_MODE,                            translate("^X^V"));
-        bind(emacs, EXCHANGE_POINT_AND_MARK,                translate("^X^X"));
-        bind(emacs, DO_LOWERCASE_VERSION,                   translate("^XA-^XZ"));
-        bind(emacs, WHAT_CURSOR_POSITION,                   translate("^X="));
-        bind(emacs, KILL_LINE,                              translate("^X^?"));
-        bind(emacs, SEND_BREAK,                             alt(ctrl('G')));
-        bind(emacs, BACKWARD_KILL_WORD,                     alt(ctrl('H')));
-        bind(emacs, SELF_INSERT_UNMETA,                     alt(ctrl('M')));
-        bind(emacs, COMPLETE_WORD,                          alt(esc()));
-        bind(emacs, CHARACTER_SEARCH_BACKWARD,              alt(ctrl(']')));
-        bind(emacs, COPY_PREV_WORD,                         alt(ctrl('_')));
-        bind(emacs, SET_MARK_COMMAND,                       alt(' '));
-        bind(emacs, NEG_ARGUMENT,                           alt('-'));
-        bind(emacs, DIGIT_ARGUMENT,                         range("\\E0-\\E9"));
-        bind(emacs, BEGINNING_OF_HISTORY,                   alt('<'));
-        bind(emacs, LIST_CHOICES,                           alt('='));
-        bind(emacs, END_OF_HISTORY,                         alt('>'));
-        bind(emacs, LIST_CHOICES,                           alt('?'));
-        bind(emacs, DO_LOWERCASE_VERSION,                   range("^[A-^[Z"));
-        bind(emacs, ACCEPT_AND_HOLD,                        alt('a'));
-        bind(emacs, BACKWARD_WORD,                          alt('b'));
-        bind(emacs, CAPITALIZE_WORD,                        alt('c'));
-        bind(emacs, KILL_WORD,                              alt('d'));
-        bind(emacs, KILL_WORD,                              translate("^[[3;5~")); // ctrl-delete
-        bind(emacs, FORWARD_WORD,                           alt('f'));
-        bind(emacs, DOWN_CASE_WORD,                         alt('l'));
-        bind(emacs, HISTORY_SEARCH_FORWARD,                 alt('n'));
-        bind(emacs, HISTORY_SEARCH_BACKWARD,                alt('p'));
-        bind(emacs, TRANSPOSE_WORDS,                        alt('t'));
-        bind(emacs, UP_CASE_WORD,                           alt('u'));
-        bind(emacs, YANK_POP,                               alt('y'));
-        bind(emacs, BACKWARD_KILL_WORD,                     alt(del()));
+        bind(emacs, SET_MARK_COMMAND, ctrl('@'));
+        bind(emacs, BEGINNING_OF_LINE, ctrl('A'));
+        bind(emacs, BACKWARD_CHAR, ctrl('B'));
+        bind(emacs, DELETE_CHAR_OR_LIST, ctrl('D'));
+        bind(emacs, END_OF_LINE, ctrl('E'));
+        bind(emacs, FORWARD_CHAR, ctrl('F'));
+        bind(emacs, SEND_BREAK, ctrl('G'));
+        bind(emacs, BACKWARD_DELETE_CHAR, ctrl('H'));
+        bind(emacs, EXPAND_OR_COMPLETE, ctrl('I'));
+        bind(emacs, ACCEPT_LINE, ctrl('J'));
+        bind(emacs, KILL_LINE, ctrl('K'));
+        bind(emacs, CLEAR_SCREEN, ctrl('L'));
+        bind(emacs, ACCEPT_LINE, ctrl('M'));
+        bind(emacs, DOWN_LINE_OR_HISTORY, ctrl('N'));
+        bind(emacs, ACCEPT_LINE_AND_DOWN_HISTORY, ctrl('O'));
+        bind(emacs, UP_LINE_OR_HISTORY, ctrl('P'));
+        bind(emacs, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('R'));
+        bind(emacs, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('S'));
+        bind(emacs, TRANSPOSE_CHARS, ctrl('T'));
+        bind(emacs, KILL_WHOLE_LINE, ctrl('U'));
+        bind(emacs, QUOTED_INSERT, ctrl('V'));
+        bind(emacs, BACKWARD_KILL_WORD, ctrl('W'));
+        bind(emacs, YANK, ctrl('Y'));
+        bind(emacs, CHARACTER_SEARCH, ctrl(']'));
+        bind(emacs, UNDO, ctrl('_'));
+        bind(emacs, SELF_INSERT, range(" -~"));
+        bind(emacs, INSERT_CLOSE_PAREN, ")");
+        bind(emacs, INSERT_CLOSE_SQUARE, "]");
+        bind(emacs, INSERT_CLOSE_CURLY, "}");
+        bind(emacs, BACKWARD_DELETE_CHAR, del());
+        bind(emacs, VI_MATCH_BRACKET, translate("^X^B"));
+        bind(emacs, SEND_BREAK, translate("^X^G"));
+        bind(emacs, EDIT_AND_EXECUTE_COMMAND, translate("^X^E"));
+        bind(emacs, VI_FIND_NEXT_CHAR, translate("^X^F"));
+        bind(emacs, VI_JOIN, translate("^X^J"));
+        bind(emacs, KILL_BUFFER, translate("^X^K"));
+        bind(emacs, INFER_NEXT_HISTORY, translate("^X^N"));
+        bind(emacs, OVERWRITE_MODE, translate("^X^O"));
+        bind(emacs, REDO, translate("^X^R"));
+        bind(emacs, UNDO, translate("^X^U"));
+        bind(emacs, VI_CMD_MODE, translate("^X^V"));
+        bind(emacs, EXCHANGE_POINT_AND_MARK, translate("^X^X"));
+        bind(emacs, DO_LOWERCASE_VERSION, translate("^XA-^XZ"));
+        bind(emacs, WHAT_CURSOR_POSITION, translate("^X="));
+        bind(emacs, KILL_LINE, translate("^X^?"));
+        bind(emacs, SEND_BREAK, alt(ctrl('G')));
+        bind(emacs, BACKWARD_KILL_WORD, alt(ctrl('H')));
+        bind(emacs, SELF_INSERT_UNMETA, alt(ctrl('M')));
+        bind(emacs, COMPLETE_WORD, alt(esc()));
+        bind(emacs, CHARACTER_SEARCH_BACKWARD, alt(ctrl(']')));
+        bind(emacs, COPY_PREV_WORD, alt(ctrl('_')));
+        bind(emacs, SET_MARK_COMMAND, alt(' '));
+        bind(emacs, NEG_ARGUMENT, alt('-'));
+        bind(emacs, DIGIT_ARGUMENT, range("\\E0-\\E9"));
+        bind(emacs, BEGINNING_OF_HISTORY, alt('<'));
+        bind(emacs, LIST_CHOICES, alt('='));
+        bind(emacs, END_OF_HISTORY, alt('>'));
+        bind(emacs, LIST_CHOICES, alt('?'));
+        bind(emacs, DO_LOWERCASE_VERSION, range("^[A-^[Z"));
+        bind(emacs, ACCEPT_AND_HOLD, alt('a'));
+        bind(emacs, BACKWARD_WORD, alt('b'));
+        bind(emacs, CAPITALIZE_WORD, alt('c'));
+        bind(emacs, KILL_WORD, alt('d'));
+        bind(emacs, KILL_WORD, translate("^[[3;5~")); // ctrl-delete
+        bind(emacs, FORWARD_WORD, alt('f'));
+        bind(emacs, DOWN_CASE_WORD, alt('l'));
+        bind(emacs, HISTORY_SEARCH_FORWARD, alt('n'));
+        bind(emacs, HISTORY_SEARCH_BACKWARD, alt('p'));
+        bind(emacs, TRANSPOSE_WORDS, alt('t'));
+        bind(emacs, UP_CASE_WORD, alt('u'));
+        bind(emacs, YANK_POP, alt('y'));
+        bind(emacs, BACKWARD_KILL_WORD, alt(del()));
         bindArrowKeys(emacs);
-        bind(emacs, FORWARD_WORD,                           translate("^[[1;5C")); // ctrl-left
-        bind(emacs, BACKWARD_WORD,                          translate("^[[1;5D")); // ctrl-right
-        bind(emacs, FORWARD_WORD,                           alt(key(Capability.key_right)));
-        bind(emacs, BACKWARD_WORD,                          alt(key(Capability.key_left)));
-        bind(emacs, FORWARD_WORD,                           alt(translate("^[[C")));
-        bind(emacs, BACKWARD_WORD,                          alt(translate("^[[D")));
+        bind(emacs, FORWARD_WORD, translate("^[[1;5C")); // ctrl-left
+        bind(emacs, BACKWARD_WORD, translate("^[[1;5D")); // ctrl-right
+        bind(emacs, FORWARD_WORD, alt(key(Capability.key_right)));
+        bind(emacs, BACKWARD_WORD, alt(key(Capability.key_left)));
+        bind(emacs, FORWARD_WORD, alt(translate("^[[C")));
+        bind(emacs, BACKWARD_WORD, alt(translate("^[[D")));
         return emacs;
     }
 
     public KeyMap<Binding> viInsertion() {
         KeyMap<Binding> viins = new KeyMap<>();
         bindKeys(viins);
-        bind(viins, SELF_INSERT,                            range("^@-^_"));
-        bind(viins, LIST_CHOICES,                           ctrl('D'));
-        bind(viins, SEND_BREAK,                             ctrl('G'));
-        bind(viins, BACKWARD_DELETE_CHAR,                   ctrl('H'));
-        bind(viins, EXPAND_OR_COMPLETE,                     ctrl('I'));
-        bind(viins, ACCEPT_LINE,                            ctrl('J'));
-        bind(viins, CLEAR_SCREEN,                           ctrl('L'));
-        bind(viins, ACCEPT_LINE,                            ctrl('M'));
-        bind(viins, MENU_COMPLETE,                          ctrl('N'));
-        bind(viins, REVERSE_MENU_COMPLETE,                  ctrl('P'));
-        bind(viins, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('R'));
-        bind(viins, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('S'));
-        bind(viins, TRANSPOSE_CHARS,                        ctrl('T'));
-        bind(viins, KILL_WHOLE_LINE,                        ctrl('U'));
-        bind(viins, QUOTED_INSERT,                          ctrl('V'));
-        bind(viins, BACKWARD_KILL_WORD,                     ctrl('W'));
-        bind(viins, YANK,                                   ctrl('Y'));
-        bind(viins, VI_CMD_MODE,                            ctrl('['));
-        bind(viins, UNDO,                                   ctrl('_'));
-        bind(viins, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('X') + "r");
-        bind(viins, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('X') + "s");
-        bind(viins, SELF_INSERT,                            range(" -~"));
-        bind(viins, INSERT_CLOSE_PAREN,                     ")");
-        bind(viins, INSERT_CLOSE_SQUARE,                    "]");
-        bind(viins, INSERT_CLOSE_CURLY,                     "}");
-        bind(viins, BACKWARD_DELETE_CHAR,                   del());
+        bind(viins, SELF_INSERT, range("^@-^_"));
+        bind(viins, LIST_CHOICES, ctrl('D'));
+        bind(viins, SEND_BREAK, ctrl('G'));
+        bind(viins, BACKWARD_DELETE_CHAR, ctrl('H'));
+        bind(viins, EXPAND_OR_COMPLETE, ctrl('I'));
+        bind(viins, ACCEPT_LINE, ctrl('J'));
+        bind(viins, CLEAR_SCREEN, ctrl('L'));
+        bind(viins, ACCEPT_LINE, ctrl('M'));
+        bind(viins, MENU_COMPLETE, ctrl('N'));
+        bind(viins, REVERSE_MENU_COMPLETE, ctrl('P'));
+        bind(viins, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('R'));
+        bind(viins, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('S'));
+        bind(viins, TRANSPOSE_CHARS, ctrl('T'));
+        bind(viins, KILL_WHOLE_LINE, ctrl('U'));
+        bind(viins, QUOTED_INSERT, ctrl('V'));
+        bind(viins, BACKWARD_KILL_WORD, ctrl('W'));
+        bind(viins, YANK, ctrl('Y'));
+        bind(viins, VI_CMD_MODE, ctrl('['));
+        bind(viins, UNDO, ctrl('_'));
+        bind(viins, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('X') + "r");
+        bind(viins, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('X') + "s");
+        bind(viins, SELF_INSERT, range(" -~"));
+        bind(viins, INSERT_CLOSE_PAREN, ")");
+        bind(viins, INSERT_CLOSE_SQUARE, "]");
+        bind(viins, INSERT_CLOSE_CURLY, "}");
+        bind(viins, BACKWARD_DELETE_CHAR, del());
         bindArrowKeys(viins);
         return viins;
     }
 
     public KeyMap<Binding> viCmd() {
         KeyMap<Binding> vicmd = new KeyMap<>();
-        bind(vicmd, LIST_CHOICES,                           ctrl('D'));
-        bind(vicmd, EMACS_EDITING_MODE,                     ctrl('E'));
-        bind(vicmd, SEND_BREAK,                             ctrl('G'));
-        bind(vicmd, VI_BACKWARD_CHAR,                       ctrl('H'));
-        bind(vicmd, ACCEPT_LINE,                            ctrl('J'));
-        bind(vicmd, KILL_LINE,                              ctrl('K'));
-        bind(vicmd, CLEAR_SCREEN,                           ctrl('L'));
-        bind(vicmd, ACCEPT_LINE,                            ctrl('M'));
-        bind(vicmd, VI_DOWN_LINE_OR_HISTORY,                ctrl('N'));
-        bind(vicmd, VI_UP_LINE_OR_HISTORY,                  ctrl('P'));
-        bind(vicmd, QUOTED_INSERT,                          ctrl('Q'));
-        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('R'));
-        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('S'));
-        bind(vicmd, TRANSPOSE_CHARS,                        ctrl('T'));
-        bind(vicmd, KILL_WHOLE_LINE,                        ctrl('U'));
-        bind(vicmd, QUOTED_INSERT,                          ctrl('V'));
-        bind(vicmd, BACKWARD_KILL_WORD,                     ctrl('W'));
-        bind(vicmd, YANK,                                   ctrl('Y'));
-        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('X') + "r");
-        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('X') + "s");
-        bind(vicmd, SEND_BREAK,                             alt(ctrl('G')));
-        bind(vicmd, BACKWARD_KILL_WORD,                     alt(ctrl('H')));
-        bind(vicmd, SELF_INSERT_UNMETA,                     alt(ctrl('M')));
-        bind(vicmd, COMPLETE_WORD,                          alt(esc()));
-        bind(vicmd, CHARACTER_SEARCH_BACKWARD,              alt(ctrl(']')));
-        bind(vicmd, SET_MARK_COMMAND,                       alt(' '));
-//        bind(vicmd, INSERT_COMMENT,                         alt('#'));
-//        bind(vicmd, INSERT_COMPLETIONS,                     alt('*'));
-        bind(vicmd, DIGIT_ARGUMENT,                         alt('-'));
-        bind(vicmd, BEGINNING_OF_HISTORY,                   alt('<'));
-        bind(vicmd, LIST_CHOICES,                           alt('='));
-        bind(vicmd, END_OF_HISTORY,                         alt('>'));
-        bind(vicmd, LIST_CHOICES,                           alt('?'));
-        bind(vicmd, DO_LOWERCASE_VERSION,                   range("^[A-^[Z"));
-        bind(vicmd, BACKWARD_WORD,                          alt('b'));
-        bind(vicmd, CAPITALIZE_WORD,                        alt('c'));
-        bind(vicmd, KILL_WORD,                              alt('d'));
-        bind(vicmd, FORWARD_WORD,                           alt('f'));
-        bind(vicmd, DOWN_CASE_WORD,                         alt('l'));
-        bind(vicmd, HISTORY_SEARCH_FORWARD,                 alt('n'));
-        bind(vicmd, HISTORY_SEARCH_BACKWARD,                alt('p'));
-        bind(vicmd, TRANSPOSE_WORDS,                        alt('t'));
-        bind(vicmd, UP_CASE_WORD,                           alt('u'));
-        bind(vicmd, YANK_POP,                               alt('y'));
-        bind(vicmd, BACKWARD_KILL_WORD,                     alt(del()));
-
-        bind(vicmd, FORWARD_CHAR,                           " ");
-        bind(vicmd, VI_INSERT_COMMENT,                      "#");
-        bind(vicmd, END_OF_LINE,                            "$");
-        bind(vicmd, VI_MATCH_BRACKET,                       "%");
-        bind(vicmd, VI_DOWN_LINE_OR_HISTORY,                "+");
-        bind(vicmd, VI_REV_REPEAT_FIND,                     ",");
-        bind(vicmd, VI_UP_LINE_OR_HISTORY,                  "-");
-        bind(vicmd, VI_REPEAT_CHANGE,                       ".");
-        bind(vicmd, VI_HISTORY_SEARCH_BACKWARD,             "/");
-        bind(vicmd, VI_DIGIT_OR_BEGINNING_OF_LINE,          "0");
-        bind(vicmd, DIGIT_ARGUMENT,                         range("1-9"));
-        bind(vicmd, VI_REPEAT_FIND,                         ";");
-        bind(vicmd, LIST_CHOICES,                           "=");
-        bind(vicmd, VI_HISTORY_SEARCH_FORWARD,              "?");
-        bind(vicmd, VI_ADD_EOL,                             "A");
-        bind(vicmd, VI_BACKWARD_BLANK_WORD,                 "B");
-        bind(vicmd, VI_CHANGE_EOL,                          "C");
-        bind(vicmd, VI_KILL_EOL,                            "D");
-        bind(vicmd, VI_FORWARD_BLANK_WORD_END,              "E");
-        bind(vicmd, VI_FIND_PREV_CHAR,                      "F");
-        bind(vicmd, VI_FETCH_HISTORY,                       "G");
-        bind(vicmd, VI_INSERT_BOL,                          "I");
-        bind(vicmd, VI_JOIN,                                "J");
-        bind(vicmd, VI_REV_REPEAT_SEARCH,                   "N");
-        bind(vicmd, VI_OPEN_LINE_ABOVE,                     "O");
-        bind(vicmd, VI_PUT_BEFORE,                          "P");
-        bind(vicmd, VI_REPLACE,                             "R");
-        bind(vicmd, VI_KILL_LINE,                           "S");
-        bind(vicmd, VI_FIND_PREV_CHAR_SKIP,                 "T");
-        bind(vicmd, REDO,                                   "U");
-        bind(vicmd, VISUAL_LINE_MODE,                       "V");
-        bind(vicmd, VI_FORWARD_BLANK_WORD,                  "W");
-        bind(vicmd, VI_BACKWARD_DELETE_CHAR,                "X");
-        bind(vicmd, VI_YANK_WHOLE_LINE,                     "Y");
-        bind(vicmd, VI_FIRST_NON_BLANK,                     "^");
-        bind(vicmd, VI_ADD_NEXT,                            "a");
-        bind(vicmd, VI_BACKWARD_WORD,                       "b");
-        bind(vicmd, VI_CHANGE,                              "c");
-        bind(vicmd, VI_DELETE,                              "d");
-        bind(vicmd, VI_FORWARD_WORD_END,                    "e");
-        bind(vicmd, VI_FIND_NEXT_CHAR,                      "f");
-        bind(vicmd, WHAT_CURSOR_POSITION,                   "ga");
-        bind(vicmd, VI_BACKWARD_BLANK_WORD_END,             "gE");
-        bind(vicmd, VI_BACKWARD_WORD_END,                   "ge");
-        bind(vicmd, VI_BACKWARD_CHAR,                       "h");
-        bind(vicmd, VI_INSERT,                              "i");
-        bind(vicmd, DOWN_LINE_OR_HISTORY,                   "j");
-        bind(vicmd, UP_LINE_OR_HISTORY,                     "k");
-        bind(vicmd, VI_FORWARD_CHAR,                        "l");
-        bind(vicmd, VI_REPEAT_SEARCH,                       "n");
-        bind(vicmd, VI_OPEN_LINE_BELOW,                     "o");
-        bind(vicmd, VI_PUT_AFTER,                           "p");
-        bind(vicmd, VI_REPLACE_CHARS,                       "r");
-        bind(vicmd, VI_SUBSTITUTE,                          "s");
-        bind(vicmd, VI_FIND_NEXT_CHAR_SKIP,                 "t");
-        bind(vicmd, UNDO,                                   "u");
-        bind(vicmd, VISUAL_MODE,                            "v");
-        bind(vicmd, VI_FORWARD_WORD,                        "w");
-        bind(vicmd, VI_DELETE_CHAR,                         "x");
-        bind(vicmd, VI_YANK,                                "y");
-        bind(vicmd, VI_GOTO_COLUMN,                         "|");
-        bind(vicmd, VI_SWAP_CASE,                           "~");
-        bind(vicmd, VI_BACKWARD_CHAR,                       del());
+        bind(vicmd, LIST_CHOICES, ctrl('D'));
+        bind(vicmd, EMACS_EDITING_MODE, ctrl('E'));
+        bind(vicmd, SEND_BREAK, ctrl('G'));
+        bind(vicmd, VI_BACKWARD_CHAR, ctrl('H'));
+        bind(vicmd, ACCEPT_LINE, ctrl('J'));
+        bind(vicmd, KILL_LINE, ctrl('K'));
+        bind(vicmd, CLEAR_SCREEN, ctrl('L'));
+        bind(vicmd, ACCEPT_LINE, ctrl('M'));
+        bind(vicmd, VI_DOWN_LINE_OR_HISTORY, ctrl('N'));
+        bind(vicmd, VI_UP_LINE_OR_HISTORY, ctrl('P'));
+        bind(vicmd, QUOTED_INSERT, ctrl('Q'));
+        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('R'));
+        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('S'));
+        bind(vicmd, TRANSPOSE_CHARS, ctrl('T'));
+        bind(vicmd, KILL_WHOLE_LINE, ctrl('U'));
+        bind(vicmd, QUOTED_INSERT, ctrl('V'));
+        bind(vicmd, BACKWARD_KILL_WORD, ctrl('W'));
+        bind(vicmd, YANK, ctrl('Y'));
+        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('X') + "r");
+        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('X') + "s");
+        bind(vicmd, SEND_BREAK, alt(ctrl('G')));
+        bind(vicmd, BACKWARD_KILL_WORD, alt(ctrl('H')));
+        bind(vicmd, SELF_INSERT_UNMETA, alt(ctrl('M')));
+        bind(vicmd, COMPLETE_WORD, alt(esc()));
+        bind(vicmd, CHARACTER_SEARCH_BACKWARD, alt(ctrl(']')));
+        bind(vicmd, SET_MARK_COMMAND, alt(' '));
+        //        bind(vicmd, INSERT_COMMENT,                         alt('#'));
+        //        bind(vicmd, INSERT_COMPLETIONS,                     alt('*'));
+        bind(vicmd, DIGIT_ARGUMENT, alt('-'));
+        bind(vicmd, BEGINNING_OF_HISTORY, alt('<'));
+        bind(vicmd, LIST_CHOICES, alt('='));
+        bind(vicmd, END_OF_HISTORY, alt('>'));
+        bind(vicmd, LIST_CHOICES, alt('?'));
+        bind(vicmd, DO_LOWERCASE_VERSION, range("^[A-^[Z"));
+        bind(vicmd, BACKWARD_WORD, alt('b'));
+        bind(vicmd, CAPITALIZE_WORD, alt('c'));
+        bind(vicmd, KILL_WORD, alt('d'));
+        bind(vicmd, FORWARD_WORD, alt('f'));
+        bind(vicmd, DOWN_CASE_WORD, alt('l'));
+        bind(vicmd, HISTORY_SEARCH_FORWARD, alt('n'));
+        bind(vicmd, HISTORY_SEARCH_BACKWARD, alt('p'));
+        bind(vicmd, TRANSPOSE_WORDS, alt('t'));
+        bind(vicmd, UP_CASE_WORD, alt('u'));
+        bind(vicmd, YANK_POP, alt('y'));
+        bind(vicmd, BACKWARD_KILL_WORD, alt(del()));
+
+        bind(vicmd, FORWARD_CHAR, " ");
+        bind(vicmd, VI_INSERT_COMMENT, "#");
+        bind(vicmd, END_OF_LINE, "$");
+        bind(vicmd, VI_MATCH_BRACKET, "%");
+        bind(vicmd, VI_DOWN_LINE_OR_HISTORY, "+");
+        bind(vicmd, VI_REV_REPEAT_FIND, ",");
+        bind(vicmd, VI_UP_LINE_OR_HISTORY, "-");
+        bind(vicmd, VI_REPEAT_CHANGE, ".");
+        bind(vicmd, VI_HISTORY_SEARCH_BACKWARD, "/");
+        bind(vicmd, VI_DIGIT_OR_BEGINNING_OF_LINE, "0");
+        bind(vicmd, DIGIT_ARGUMENT, range("1-9"));
+        bind(vicmd, VI_REPEAT_FIND, ";");
+        bind(vicmd, LIST_CHOICES, "=");
+        bind(vicmd, VI_HISTORY_SEARCH_FORWARD, "?");
+        bind(vicmd, VI_ADD_EOL, "A");
+        bind(vicmd, VI_BACKWARD_BLANK_WORD, "B");
+        bind(vicmd, VI_CHANGE_EOL, "C");
+        bind(vicmd, VI_KILL_EOL, "D");
+        bind(vicmd, VI_FORWARD_BLANK_WORD_END, "E");
+        bind(vicmd, VI_FIND_PREV_CHAR, "F");
+        bind(vicmd, VI_FETCH_HISTORY, "G");
+        bind(vicmd, VI_INSERT_BOL, "I");
+        bind(vicmd, VI_JOIN, "J");
+        bind(vicmd, VI_REV_REPEAT_SEARCH, "N");
+        bind(vicmd, VI_OPEN_LINE_ABOVE, "O");
+        bind(vicmd, VI_PUT_BEFORE, "P");
+        bind(vicmd, VI_REPLACE, "R");
+        bind(vicmd, VI_KILL_LINE, "S");
+        bind(vicmd, VI_FIND_PREV_CHAR_SKIP, "T");
+        bind(vicmd, REDO, "U");
+        bind(vicmd, VISUAL_LINE_MODE, "V");
+        bind(vicmd, VI_FORWARD_BLANK_WORD, "W");
+        bind(vicmd, VI_BACKWARD_DELETE_CHAR, "X");
+        bind(vicmd, VI_YANK_WHOLE_LINE, "Y");
+        bind(vicmd, VI_FIRST_NON_BLANK, "^");
+        bind(vicmd, VI_ADD_NEXT, "a");
+        bind(vicmd, VI_BACKWARD_WORD, "b");
+        bind(vicmd, VI_CHANGE, "c");
+        bind(vicmd, VI_DELETE, "d");
+        bind(vicmd, VI_FORWARD_WORD_END, "e");
+        bind(vicmd, VI_FIND_NEXT_CHAR, "f");
+        bind(vicmd, WHAT_CURSOR_POSITION, "ga");
+        bind(vicmd, VI_BACKWARD_BLANK_WORD_END, "gE");
+        bind(vicmd, VI_BACKWARD_WORD_END, "ge");
+        bind(vicmd, VI_BACKWARD_CHAR, "h");
+        bind(vicmd, VI_INSERT, "i");
+        bind(vicmd, DOWN_LINE_OR_HISTORY, "j");
+        bind(vicmd, UP_LINE_OR_HISTORY, "k");
+        bind(vicmd, VI_FORWARD_CHAR, "l");
+        bind(vicmd, VI_REPEAT_SEARCH, "n");
+        bind(vicmd, VI_OPEN_LINE_BELOW, "o");
+        bind(vicmd, VI_PUT_AFTER, "p");
+        bind(vicmd, VI_REPLACE_CHARS, "r");
+        bind(vicmd, VI_SUBSTITUTE, "s");
+        bind(vicmd, VI_FIND_NEXT_CHAR_SKIP, "t");
+        bind(vicmd, UNDO, "u");
+        bind(vicmd, VISUAL_MODE, "v");
+        bind(vicmd, VI_FORWARD_WORD, "w");
+        bind(vicmd, VI_DELETE_CHAR, "x");
+        bind(vicmd, VI_YANK, "y");
+        bind(vicmd, VI_GOTO_COLUMN, "|");
+        bind(vicmd, VI_SWAP_CASE, "~");
+        bind(vicmd, VI_BACKWARD_CHAR, del());
 
         bindArrowKeys(vicmd);
         return vicmd;
@@ -6150,38 +6303,46 @@ public KeyMap<Binding> viCmd() {
 
     public KeyMap<Binding> menu() {
         KeyMap<Binding> menu = new KeyMap<>();
-        bind(menu, MENU_COMPLETE,                     "\t");
-        bind(menu, REVERSE_MENU_COMPLETE,             key(Capability.back_tab));
-        bind(menu, ACCEPT_LINE,                       "\r", "\n");
+        bind(menu, MENU_COMPLETE, "\t");
+        bind(menu, REVERSE_MENU_COMPLETE, key(Capability.back_tab));
+        bind(menu, ACCEPT_LINE, "\r", "\n");
         bindArrowKeys(menu);
         return menu;
     }
 
     public KeyMap<Binding> safe() {
         KeyMap<Binding> safe = new KeyMap<>();
-        bind(safe, SELF_INSERT,                 range("^@-^?"));
-        bind(safe, ACCEPT_LINE,                 "\r", "\n");
-        bind(safe, SEND_BREAK,                  ctrl('G'));
+        bind(safe, SELF_INSERT, range("^@-^?"));
+        bind(safe, ACCEPT_LINE, "\r", "\n");
+        bind(safe, SEND_BREAK, ctrl('G'));
         return safe;
     }
 
+    public KeyMap<Binding> dumb() {
+        KeyMap<Binding> dumb = new KeyMap<>();
+        bind(dumb, SELF_INSERT, range("^@-^?"));
+        bind(dumb, ACCEPT_LINE, "\r", "\n");
+        bind(dumb, BEEP, ctrl('G'));
+        return dumb;
+    }
+
     public KeyMap<Binding> visual() {
         KeyMap<Binding> visual = new KeyMap<>();
-        bind(visual, UP_LINE,                   key(Capability.key_up),     "k");
-        bind(visual, DOWN_LINE,                 key(Capability.key_down),   "j");
-        bind(visual, this::deactivateRegion,    esc());
-        bind(visual, EXCHANGE_POINT_AND_MARK,   "o");
-        bind(visual, PUT_REPLACE_SELECTION,     "p");
-        bind(visual, VI_DELETE,                 "x");
-        bind(visual, VI_OPER_SWAP_CASE,         "~");
+        bind(visual, UP_LINE, key(Capability.key_up), "k");
+        bind(visual, DOWN_LINE, key(Capability.key_down), "j");
+        bind(visual, this::deactivateRegion, esc());
+        bind(visual, EXCHANGE_POINT_AND_MARK, "o");
+        bind(visual, PUT_REPLACE_SELECTION, "p");
+        bind(visual, VI_DELETE, "x");
+        bind(visual, VI_OPER_SWAP_CASE, "~");
         return visual;
     }
 
     public KeyMap<Binding> viOpp() {
         KeyMap<Binding> viOpp = new KeyMap<>();
-        bind(viOpp, UP_LINE,                    key(Capability.key_up),     "k");
-        bind(viOpp, DOWN_LINE,                  key(Capability.key_down),   "j");
-        bind(viOpp, VI_CMD_MODE,                esc());
+        bind(viOpp, UP_LINE, key(Capability.key_up), "k");
+        bind(viOpp, DOWN_LINE, key(Capability.key_down), "j");
+        bind(viOpp, VI_CMD_MODE, esc());
         return viOpp;
     }
 
@@ -6210,19 +6371,19 @@ private void bindKeys(KeyMap<Binding> emacs) {
     }
 
     private void bindArrowKeys(KeyMap<Binding> map) {
-        bind(map, UP_LINE_OR_SEARCH,    key(Capability.key_up));
-        bind(map, DOWN_LINE_OR_SEARCH,  key(Capability.key_down));
-        bind(map, BACKWARD_CHAR,        key(Capability.key_left));
-        bind(map, FORWARD_CHAR,         key(Capability.key_right));
-        bind(map, BEGINNING_OF_LINE,    key(Capability.key_home));
-        bind(map, END_OF_LINE,          key(Capability.key_end));
-        bind(map, DELETE_CHAR,          key(Capability.key_dc));
-        bind(map, KILL_WHOLE_LINE,      key(Capability.key_dl));
-        bind(map, OVERWRITE_MODE,       key(Capability.key_ic));
-        bind(map, MOUSE,                key(Capability.key_mouse));
-        bind(map, BEGIN_PASTE,          BRACKETED_PASTE_BEGIN);
-        bind(map, FOCUS_IN,             FOCUS_IN_SEQ);
-        bind(map, FOCUS_OUT,            FOCUS_OUT_SEQ);
+        bind(map, UP_LINE_OR_SEARCH, key(Capability.key_up));
+        bind(map, DOWN_LINE_OR_SEARCH, key(Capability.key_down));
+        bind(map, BACKWARD_CHAR, key(Capability.key_left));
+        bind(map, FORWARD_CHAR, key(Capability.key_right));
+        bind(map, BEGINNING_OF_LINE, key(Capability.key_home));
+        bind(map, END_OF_LINE, key(Capability.key_end));
+        bind(map, DELETE_CHAR, key(Capability.key_dc));
+        bind(map, KILL_WHOLE_LINE, key(Capability.key_dl));
+        bind(map, OVERWRITE_MODE, key(Capability.key_ic));
+        bind(map, MOUSE, key(Capability.key_mouse));
+        bind(map, BEGIN_PASTE, BRACKETED_PASTE_BEGIN);
+        bind(map, FOCUS_IN, FOCUS_IN_SEQ);
+        bind(map, FOCUS_OUT, FOCUS_OUT_SEQ);
     }
 
     /**
@@ -6231,14 +6392,10 @@ private void bindArrowKeys(KeyMap<Binding> map) {
      */
     private void bindConsoleChars(KeyMap<Binding> keyMap, Attributes attr) {
         if (attr != null) {
-            rebind(keyMap, BACKWARD_DELETE_CHAR,
-                    del(), (char) attr.getControlChar(ControlChar.VERASE));
-            rebind(keyMap, BACKWARD_KILL_WORD,
-                    ctrl('W'),  (char) attr.getControlChar(ControlChar.VWERASE));
-            rebind(keyMap, KILL_WHOLE_LINE,
-                    ctrl('U'), (char) attr.getControlChar(ControlChar.VKILL));
-            rebind(keyMap, QUOTED_INSERT,
-                    ctrl('V'), (char) attr.getControlChar(ControlChar.VLNEXT));
+            rebind(keyMap, BACKWARD_DELETE_CHAR, del(), (char) attr.getControlChar(ControlChar.VERASE));
+            rebind(keyMap, BACKWARD_KILL_WORD, ctrl('W'), (char) attr.getControlChar(ControlChar.VWERASE));
+            rebind(keyMap, KILL_WHOLE_LINE, ctrl('U'), (char) attr.getControlChar(ControlChar.VKILL));
+            rebind(keyMap, QUOTED_INSERT, ctrl('V'), (char) attr.getControlChar(ControlChar.VLNEXT));
         }
     }
 
@@ -6250,7 +6407,6 @@ private void rebind(KeyMap<Binding> keyMap, String operation, String prevBinding
         }
     }
 
-    // JDK specific modification
     @Override
     public void zeroOut() {
         buf.zeroOut();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/ReaderUtils.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/ReaderUtils.java
index 0ae9475bd57bd..cdc60dccccfaf 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/ReaderUtils.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/ReaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,7 +13,7 @@
 
 public class ReaderUtils {
 
-    private ReaderUtils() { }
+    private ReaderUtils() {}
 
     public static boolean isSet(LineReader reader, LineReader.Option option) {
         return reader != null && reader.isSet(option);
@@ -30,8 +30,7 @@ public static boolean getBoolean(LineReader reader, String name, boolean def) {
             return (Boolean) v;
         } else if (v != null) {
             String s = v.toString();
-            return s.isEmpty() || s.equalsIgnoreCase("on")
-                    || s.equalsIgnoreCase("1") || s.equalsIgnoreCase("true");
+            return s.isEmpty() || s.equalsIgnoreCase("on") || s.equalsIgnoreCase("1") || s.equalsIgnoreCase("true");
         }
         return def;
     }
@@ -77,5 +76,4 @@ public static int distance(String word, String cand) {
             return Levenshtein.distance(word, cand);
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/SimpleMaskingCallback.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/SimpleMaskingCallback.java
index fd6c2663c057e..423497f3dc44a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/SimpleMaskingCallback.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/SimpleMaskingCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,10 +8,10 @@
  */
 package jdk.internal.org.jline.reader.impl;
 
-import jdk.internal.org.jline.reader.MaskingCallback;
-
 import java.util.Objects;
 
+import jdk.internal.org.jline.reader.MaskingCallback;
+
 /**
  * Simple {@link MaskingCallback} that will replace all the characters in the line with the given mask.
  * If the given mask is equal to {@link LineReaderImpl#NULL_MASK} then the line will be replaced with an empty String.
@@ -29,7 +29,7 @@ public String display(String line) {
             return "";
         } else {
             StringBuilder sb = new StringBuilder(line.length());
-            for (int i = line.length(); i-- > 0;) {
+            for (int i = line.length(); i-- > 0; ) {
                 sb.append((char) mask);
             }
             return sb.toString();
@@ -40,5 +40,4 @@ public String display(String line) {
     public String history(String line) {
         return null;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/UndoTree.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/UndoTree.java
index 0a467f9d7bac7..3b193f9eb65ea 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/UndoTree.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/UndoTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -20,6 +20,7 @@ public class UndoTree<T> {
     private final Node parent;
     private Node current;
 
+    @SuppressWarnings("this-escape")
     public UndoTree(Consumer<T> s) {
         state = s;
         parent = new Node(null);
@@ -71,5 +72,4 @@ public Node(T s) {
             state = s;
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/AggregateCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/AggregateCompleter.java
index e8e41088c598e..145823c53cede 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/AggregateCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/AggregateCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -24,9 +24,7 @@
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public class AggregateCompleter
-    implements Completer
-{
+public class AggregateCompleter implements Completer {
     private final Collection<Completer> completers;
 
     /**
@@ -78,9 +76,6 @@ public void complete(LineReader reader, final ParsedLine line, final List<Candid
      */
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "{" +
-            "completers=" + completers +
-            '}';
+        return getClass().getSimpleName() + "{" + "completers=" + completers + '}';
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/ArgumentCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/ArgumentCompleter.java
index f84c8a9002af8..f0efa292252e4 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/ArgumentCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/ArgumentCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -29,8 +29,7 @@
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public class ArgumentCompleter implements Completer
-{
+public class ArgumentCompleter implements Completer {
     private final List<Completer> completers = new ArrayList<>();
 
     private boolean strict = true;
@@ -108,12 +107,12 @@ public void complete(LineReader reader, ParsedLine line, final List<Candidate> c
         // if we are beyond the end of the completers, just use the last one
         if (line.wordIndex() >= completers.size()) {
             completer = completers.get(completers.size() - 1);
-        }
-        else {
+        } else {
             completer = completers.get(line.wordIndex());
         }
 
-        // ensure that all the previous completers are successful before allowing this completer to pass (only if strict).
+        // ensure that all the previous completers are successful before allowing this completer to pass (only if
+        // strict).
         for (int i = strictCommand ? 0 : 1; isStrict() && (i < line.wordIndex()); i++) {
             int idx = i >= completers.size() ? (completers.size() - 1) : i;
             if (idx == 0 && !strictCommand) {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/EnumCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/EnumCompleter.java
index 6a18d3cfd93a0..a701f2e3560bc 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/EnumCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/EnumCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -19,8 +19,7 @@
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public class EnumCompleter extends StringsCompleter
-{
+public class EnumCompleter extends StringsCompleter {
     public EnumCompleter(Class<? extends Enum<?>> source) {
         Objects.requireNonNull(source);
         for (Enum<?> n : source.getEnumConstants()) {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/FileNameCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/FileNameCompleter.java
index 3d173f72ec7e5..32bf6e3493e6a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/FileNameCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/FileNameCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -9,6 +9,7 @@
 package jdk.internal.org.jline.reader.impl.completer;
 
 import java.io.IOException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -41,11 +42,10 @@
  * @author <a href="mailto:mwp1@cornell.edu">Marc Prud'hommeaux</a>
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
- * @deprecated use <code>jdk.internal.org.jline.builtins.Completers$FileNameCompleter</code> instead
+ * @deprecated use <code>org.jline.builtins.Completers$FileNameCompleter</code> instead
  */
 @Deprecated
-public class FileNameCompleter implements Completer
-{
+public class FileNameCompleter implements Completer {
 
     public void complete(LineReader reader, ParsedLine commandLine, final List<Candidate> candidates) {
         assert commandLine != null;
@@ -72,20 +72,21 @@ public void complete(LineReader reader, ParsedLine commandLine, final List<Candi
             curBuf = "";
             current = getUserDir();
         }
-        try {
-            Files.newDirectoryStream(current, this::accept).forEach(p -> {
+        try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(current, this::accept)) {
+            directoryStream.forEach(p -> {
                 String value = curBuf + p.getFileName().toString();
                 if (Files.isDirectory(p)) {
                     candidates.add(new Candidate(
                             value + (reader.isSet(Option.AUTO_PARAM_SLASH) ? sep : ""),
                             getDisplay(reader.getTerminal(), p),
-                            null, null,
+                            null,
+                            null,
                             reader.isSet(Option.AUTO_REMOVE_SLASH) ? sep : null,
                             null,
                             false));
                 } else {
-                    candidates.add(new Candidate(value, getDisplay(reader.getTerminal(), p),
-                            null, null, null, null, true));
+                    candidates.add(
+                            new Candidate(value, getDisplay(reader.getTerminal(), p), null, null, null, null, true));
                 }
             });
         } catch (IOException e) {
@@ -125,5 +126,4 @@ protected String getDisplay(Terminal terminal, Path p) {
         }
         return name;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/NullCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/NullCompleter.java
index f3efefdc92919..21ce836a32f4e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/NullCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/NullCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -22,11 +22,8 @@
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public final class NullCompleter
-    implements Completer
-{
+public final class NullCompleter implements Completer {
     public static final NullCompleter INSTANCE = new NullCompleter();
 
-    public void complete(LineReader reader, final ParsedLine line, final List<Candidate> candidates) {
-    }
+    public void complete(LineReader reader, final ParsedLine line, final List<Candidate> candidates) {}
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/StringsCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/StringsCompleter.java
index 8baac657b93d9..c791ef68e72a4 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/StringsCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/StringsCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -27,8 +27,7 @@
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public class StringsCompleter implements Completer
-{
+public class StringsCompleter implements Completer {
     protected Collection<Candidate> candidates;
     protected Supplier<Collection<String>> stringsSupplier;
 
@@ -54,7 +53,7 @@ public StringsCompleter(Iterable<String> strings) {
         }
     }
 
-    public StringsCompleter(Candidate ... candidates) {
+    public StringsCompleter(Candidate... candidates) {
         this(Arrays.asList(candidates));
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
index a17a356bf0e5d..2fe6f8df49213 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -22,8 +22,8 @@
  * @author <a href="mailto:matti.rintanikkola@gmail.com">Matti Rinta-Nikkola</a>
  */
 public class SystemCompleter implements Completer {
-    private Map<String,List<Completer>> completers = new HashMap<>();
-    private Map<String,String> aliasCommand = new HashMap<>();
+    private Map<String, List<Completer>> completers = new HashMap<>();
+    private Map<String, String> aliasCommand = new HashMap<>();
     private StringsCompleter commands;
     private boolean compiled = false;
 
@@ -44,9 +44,9 @@ public void complete(LineReader reader, ParsedLine commandLine, List<Candidate>
                     commands.complete(reader, commandLine, candidates);
                 } else if (reader.getParser().validVariableName(buffer.substring(0, eq))) {
                     String curBuf = buffer.substring(0, eq + 1);
-                    for (String c: completers.keySet()) {
-                        candidates.add(new Candidate(AttributedString.stripAnsi(curBuf+c)
-                                    , c, null, null, null, null, true));
+                    for (String c : completers.keySet()) {
+                        candidates.add(
+                                new Candidate(AttributedString.stripAnsi(curBuf + c), c, null, null, null, null, true));
                     }
                 }
             } else {
@@ -81,7 +81,7 @@ public void add(String command, List<Completer> completers) {
     }
 
     public void add(List<String> commands, Completer completer) {
-        for (String c: commands) {
+        for (String c : commands) {
             add(c, completer);
         }
     }
@@ -104,22 +104,22 @@ public void add(SystemCompleter other) {
         if (other.isCompiled()) {
             throw new IllegalStateException();
         }
-        for (Map.Entry<String, List<Completer>> entry: other.getCompleters().entrySet()) {
-            for (Completer c: entry.getValue()) {
+        for (Map.Entry<String, List<Completer>> entry : other.getCompleters().entrySet()) {
+            for (Completer c : entry.getValue()) {
                 add(entry.getKey(), c);
             }
         }
         addAliases(other.getAliases());
     }
 
-    public void addAliases(Map<String,String> aliasCommand) {
+    public void addAliases(Map<String, String> aliasCommand) {
         if (compiled) {
             throw new IllegalStateException();
         }
         this.aliasCommand.putAll(aliasCommand);
     }
 
-    private Map<String,String> getAliases() {
+    private Map<String, String> getAliases() {
         return aliasCommand;
     }
 
@@ -128,7 +128,7 @@ public void compile() {
             return;
         }
         Map<String, List<Completer>> compiledCompleters = new HashMap<>();
-        for (Map.Entry<String, List<Completer>> entry: completers.entrySet()) {
+        for (Map.Entry<String, List<Completer>> entry : completers.entrySet()) {
             if (entry.getValue().size() == 1) {
                 compiledCompleters.put(entry.getKey(), entry.getValue());
             } else {
@@ -143,8 +143,7 @@ public void compile() {
         compiled = true;
     }
 
-    public Map<String,List<Completer>> getCompleters() {
+    public Map<String, List<Completer>> getCompleters() {
         return completers;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
index cdd1bc520ddd8..c696b33ba9e5b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -41,9 +41,9 @@ public class DefaultHistory implements History {
     private int offset = 0;
     private int index = 0;
 
-    public DefaultHistory() {
-    }
+    public DefaultHistory() {}
 
+    @SuppressWarnings("this-escape")
     public DefaultHistory(LineReader reader) {
         attach(reader);
     }
@@ -67,8 +67,7 @@ public void attach(LineReader reader) {
             this.reader = reader;
             try {
                 load();
-            }
-            catch (IllegalArgumentException | IOException e) {
+            } catch (IllegalArgumentException | IOException e) {
                 Log.warn("Failed to load history", e);
             }
         }
@@ -117,13 +116,13 @@ public void read(Path file, boolean checkDuplicates) throws IOException {
         }
     }
 
-    private String doHistoryFileDataKey (Path path){
+    private String doHistoryFileDataKey(Path path) {
         return path != null ? path.toAbsolutePath().toString() : null;
     }
 
     private HistoryFileData getHistoryFileData(Path path) {
         String key = doHistoryFileDataKey(path);
-        if (!historyFiles.containsKey(key)){
+        if (!historyFiles.containsKey(key)) {
             historyFiles.put(key, new HistoryFileData());
         }
         return historyFiles.get(key);
@@ -133,7 +132,7 @@ private void setHistoryFileData(Path path, HistoryFileData historyFileData) {
         historyFiles.put(doHistoryFileDataKey(path), historyFileData);
     }
 
-    private boolean isLineReaderHistory (Path path) throws IOException {
+    private boolean isLineReaderHistory(Path path) throws IOException {
         Path lrp = getPath();
         if (lrp == null) {
             return path == null;
@@ -141,23 +140,23 @@ private boolean isLineReaderHistory (Path path) throws IOException {
         return Files.isSameFile(lrp, path);
     }
 
-    private void setLastLoaded(Path path, int lastloaded){
+    private void setLastLoaded(Path path, int lastloaded) {
         getHistoryFileData(path).setLastLoaded(lastloaded);
     }
 
-    private void setEntriesInFile(Path path, int entriesInFile){
+    private void setEntriesInFile(Path path, int entriesInFile) {
         getHistoryFileData(path).setEntriesInFile(entriesInFile);
     }
 
-    private void incEntriesInFile(Path path, int amount){
+    private void incEntriesInFile(Path path, int amount) {
         getHistoryFileData(path).incEntriesInFile(amount);
     }
 
-    private int getLastLoaded(Path path){
+    private int getLastLoaded(Path path) {
         return getHistoryFileData(path).getLastLoaded();
     }
 
-    private int getEntriesInFile(Path path){
+    private int getEntriesInFile(Path path) {
         return getHistoryFileData(path).getEntriesInFile();
     }
 
@@ -168,9 +167,8 @@ protected void addHistoryLine(Path path, String line) {
     protected void addHistoryLine(Path path, String line, boolean checkDuplicates) {
         if (reader.isSet(LineReader.Option.HISTORY_TIMESTAMPED)) {
             int idx = line.indexOf(':');
-            final String badHistoryFileSyntax = "Bad history file syntax! " +
-                "The history file `" + path + "` may be an older history: " +
-                "please remove it or use a different history file.";
+            final String badHistoryFileSyntax = "Bad history file syntax! " + "The history file `" + path
+                    + "` may be an older history: " + "please remove it or use a different history file.";
             if (idx < 0) {
                 throw new IllegalArgumentException(badHistoryFileSyntax);
             }
@@ -183,8 +181,7 @@ protected void addHistoryLine(Path path, String line, boolean checkDuplicates) {
 
             String unescaped = unescape(line.substring(idx + 1));
             internalAdd(time, unescaped, checkDuplicates);
-        }
-        else {
+        } else {
             internalAdd(Instant.now(), unescape(line), checkDuplicates);
         }
     }
@@ -210,8 +207,7 @@ public void write(Path file, boolean incremental) throws IOException {
 
     @Override
     public void append(Path file, boolean incremental) throws IOException {
-        internalWrite(file != null ? file : getPath(),
-                      incremental ? getLastLoaded(file) : 0);
+        internalWrite(file != null ? file : getPath(), incremental ? getLastLoaded(file) : 0);
     }
 
     @Override
@@ -227,8 +223,11 @@ private void internalWrite(Path path, int from) throws IOException {
                 Files.createDirectories(parent);
             }
             // Append new items to the history file
-            try (BufferedWriter writer = Files.newBufferedWriter(path.toAbsolutePath(),
-              StandardOpenOption.WRITE, StandardOpenOption.APPEND, StandardOpenOption.CREATE)) {
+            try (BufferedWriter writer = Files.newBufferedWriter(
+                    path.toAbsolutePath(),
+                    StandardOpenOption.WRITE,
+                    StandardOpenOption.APPEND,
+                    StandardOpenOption.CREATE)) {
                 for (Entry entry : items.subList(from, items.size())) {
                     if (isPersistable(entry)) {
                         writer.append(format(entry));
@@ -248,18 +247,23 @@ protected void trimHistory(Path path, int max) throws IOException {
         Log.trace("Trimming history path: ", path);
         // Load all history entries
         LinkedList<Entry> allItems = new LinkedList<>();
-        try (BufferedReader reader = Files.newBufferedReader(path)) {
-            reader.lines().forEach(l -> {
-                int idx = l.indexOf(':');
-                Instant time = Instant.ofEpochMilli(Long.parseLong(l.substring(0, idx)));
-                String line = unescape(l.substring(idx + 1));
-                allItems.add(createEntry(allItems.size(), time, line));
+        try (BufferedReader historyFileReader = Files.newBufferedReader(path)) {
+            historyFileReader.lines().forEach(l -> {
+                if (reader.isSet(LineReader.Option.HISTORY_TIMESTAMPED)) {
+                    int idx = l.indexOf(':');
+                    Instant time = Instant.ofEpochMilli(Long.parseLong(l.substring(0, idx)));
+                    String line = unescape(l.substring(idx + 1));
+                    allItems.add(createEntry(allItems.size(), time, line));
+                } else {
+                    allItems.add(createEntry(allItems.size(), Instant.now(), unescape(l)));
+                }
             });
         }
         // Remove duplicates
         List<Entry> trimmedItems = doTrimHistory(allItems, max);
         // Write history
-        Path temp = Files.createTempFile(path.toAbsolutePath().getParent(), path.getFileName().toString(), ".tmp");
+        Path temp = Files.createTempFile(
+                path.toAbsolutePath().getParent(), path.getFileName().toString(), ".tmp");
         try (BufferedWriter writer = Files.newBufferedWriter(temp, StandardOpenOption.WRITE)) {
             for (Entry entry : trimmedItems) {
                 writer.append(format(entry));
@@ -351,7 +355,7 @@ private String format(Entry entry) {
     public String get(final int index) {
         int idx = index - offset;
         if (idx >= items.size() || idx < 0) {
-            throw new IllegalArgumentException("IndexOutOfBounds: Index:" + idx +", Size:" + items.size());
+            throw new IllegalArgumentException("IndexOutOfBounds: Index:" + idx + ", Size:" + items.size());
         }
         return items.get(idx).line();
     }
@@ -382,8 +386,7 @@ public void add(Instant time, String line) {
         if (isSet(reader, LineReader.Option.HISTORY_INCREMENTAL)) {
             try {
                 save();
-            }
-            catch (IOException e) {
+            } catch (IOException e) {
                 Log.warn("Failed to save history", e);
             }
         }
@@ -417,7 +420,7 @@ protected void internalAdd(Instant time, String line) {
     protected void internalAdd(Instant time, String line, boolean checkDuplicates) {
         Entry entry = new EntryImpl(offset + items.size(), time, line);
         if (checkDuplicates) {
-            for (Entry e: items) {
+            for (Entry e : items) {
                 if (e.line().trim().equals(line.trim())) {
                     return;
                 }
@@ -430,7 +433,7 @@ protected void internalAdd(Instant time, String line, boolean checkDuplicates) {
     private void maybeResize() {
         while (size() > getInt(reader, LineReader.HISTORY_SIZE, DEFAULT_HISTORY_SIZE)) {
             items.removeFirst();
-            for (HistoryFileData hfd: historyFiles.values()) {
+            for (HistoryFileData hfd : historyFiles.values()) {
                 hfd.decLastLoaded();
             }
             offset++;
@@ -633,8 +636,7 @@ private static class HistoryFileData {
         private int lastLoaded = 0;
         private int entriesInFile = 0;
 
-        public HistoryFileData() {
-        }
+        public HistoryFileData() {}
 
         public HistoryFileData(int lastLoaded, int entriesInFile) {
             this.lastLoaded = lastLoaded;
@@ -667,8 +669,5 @@ public void setEntriesInFile(int entriesInFile) {
         public void incEntriesInFile(int amount) {
             entriesInFile = entriesInFile + amount;
         }
-
     }
-
 }
-
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Attributes.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Attributes.java
index b1bab287e79be..04959488cf158 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Attributes.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Attributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -43,63 +43,65 @@ public enum ControlChar {
      * Input flags - software input processing
      */
     public enum InputFlag {
-        IGNBRK,       /* ignore BREAK condition */
-        BRKINT,       /* map BREAK to SIGINTR */
-        IGNPAR,       /* ignore (discard) parity errors */
-        PARMRK,       /* mark parity and framing errors */
-        INPCK,        /* enable checking of parity errors */
-        ISTRIP,       /* strip 8th bit off chars */
-        INLCR,        /* map NL into CR */
-        IGNCR,        /* ignore CR */
-        ICRNL,        /* map CR to NL (ala CRMOD) */
-        IXON,         /* enable output flow control */
-        IXOFF,        /* enable input flow control */
-        IXANY,        /* any char will restart after stop */
-        IMAXBEL,      /* ring bell on input queue full */
-        IUTF8         /* maintain state for UTF-8 VERASE */
+        IGNBRK, /* ignore BREAK condition */
+        BRKINT, /* map BREAK to SIGINTR */
+        IGNPAR, /* ignore (discard) parity errors */
+        PARMRK, /* mark parity and framing errors */
+        INPCK, /* enable checking of parity errors */
+        ISTRIP, /* strip 8th bit off chars */
+        INLCR, /* map NL into CR */
+        IGNCR, /* ignore CR */
+        ICRNL, /* map CR to NL (ala CRMOD) */
+        IXON, /* enable output flow control */
+        IXOFF, /* enable input flow control */
+        IXANY, /* any char will restart after stop */
+        IMAXBEL, /* ring bell on input queue full */
+        IUTF8, /* maintain state for UTF-8 VERASE */
+
+        INORMEOL /* normalize end-of-line */
     }
 
     /*
      * Output flags - software output processing
      */
     public enum OutputFlag {
-        OPOST,       /* enable following output processing */
-        ONLCR,       /* map NL to CR-NL (ala CRMOD) */
-        OXTABS,      /* expand tabs to spaces */
-        ONOEOT,      /* discard EOT's (^D) on output) */
-        OCRNL,       /* map CR to NL on output */
-        ONOCR,       /* no CR output at column 0 */
-        ONLRET,      /* NL performs CR function */
-        OFILL,       /* use fill characters for delay */
-        NLDLY,       /* \n delay */
-        TABDLY,      /* horizontal tab delay */
-        CRDLY,       /* \r delay */
-        FFDLY,       /* form feed delay */
-        BSDLY,       /* \b delay */
-        VTDLY,       /* vertical tab delay */
-        OFDEL        /* fill is DEL, else NUL */
+        OPOST, /* enable following output processing */
+        ONLCR, /* map NL to CR-NL (ala CRMOD) */
+        OXTABS, /* expand tabs to spaces */
+        ONOEOT, /* discard EOT's (^D) on output) */
+        OCRNL, /* map CR to NL on output */
+        ONOCR, /* no CR output at column 0 */
+        ONLRET, /* NL performs CR function */
+        OFILL, /* use fill characters for delay */
+        NLDLY, /* \n delay */
+        TABDLY, /* horizontal tab delay */
+        CRDLY, /* \r delay */
+        FFDLY, /* form feed delay */
+        BSDLY, /* \b delay */
+        VTDLY, /* vertical tab delay */
+        OFDEL /* fill is DEL, else NUL */
     }
 
     /*
      * Control flags - hardware control of terminal
      */
     public enum ControlFlag {
-        CIGNORE,          /* ignore control flags */
-        CS5,              /* 5 bits    (pseudo) */
-        CS6,              /* 6 bits */
-        CS7,              /* 7 bits */
-        CS8,              /* 8 bits */
-        CSTOPB,           /* send 2 stop bits */
-        CREAD,            /* enable receiver */
-        PARENB,           /* parity enable */
-        PARODD,           /* odd parity, else even */
-        HUPCL,            /* hang up on last close */
-        CLOCAL,           /* ignore modem status lines */
-        CCTS_OFLOW,       /* CTS flow control of output */
-        CRTS_IFLOW,       /* RTS flow control of input */
-        CDTR_IFLOW,       /* DTR flow control of input */
-        CDSR_OFLOW,       /* DSR flow control of output */
-        CCAR_OFLOW        /* DCD flow control of output */
+        CIGNORE, /* ignore control flags */
+        CS5, /* 5 bits    (pseudo) */
+        CS6, /* 6 bits */
+        CS7, /* 7 bits */
+        CS8, /* 8 bits */
+        CSTOPB, /* send 2 stop bits */
+        CREAD, /* enable receiver */
+        PARENB, /* parity enable */
+        PARODD, /* odd parity, else even */
+        HUPCL, /* hang up on last close */
+        CLOCAL, /* ignore modem status lines */
+        CCTS_OFLOW, /* CTS flow control of output */
+        CRTS_IFLOW, /* RTS flow control of input */
+        CDTR_IFLOW, /* DTR flow control of input */
+        CDSR_OFLOW, /* DSR flow control of output */
+        CCAR_OFLOW /* DCD flow control of output */
     }
 
     /*
@@ -110,23 +112,23 @@ public enum ControlFlag {
      * input flag.
      */
     public enum LocalFlag {
-        ECHOKE,           /* visual erase for line kill */
-        ECHOE,            /* visually erase chars */
-        ECHOK,            /* echo NL after line kill */
-        ECHO,             /* enable echoing */
-        ECHONL,           /* echo NL even if ECHO is off */
-        ECHOPRT,          /* visual erase mode for hardcopy */
-        ECHOCTL,          /* echo control chars as ^(Char) */
-        ISIG,             /* enable signals INTR, QUIT, [D]SUSP */
-        ICANON,           /* canonicalize input lines */
-        ALTWERASE,        /* use alternate WERASE algorithm */
-        IEXTEN,           /* enable DISCARD and LNEXT */
-        EXTPROC,          /* external processing */
-        TOSTOP,           /* stop background jobs from output */
-        FLUSHO,           /* output being flushed (state) */
-        NOKERNINFO,       /* no kernel output from VSTATUS */
-        PENDIN,           /* XXX retype pending input (state) */
-        NOFLSH            /* don't flush after interrupt */
+        ECHOKE, /* visual erase for line kill */
+        ECHOE, /* visually erase chars */
+        ECHOK, /* echo NL after line kill */
+        ECHO, /* enable echoing */
+        ECHONL, /* echo NL even if ECHO is off */
+        ECHOPRT, /* visual erase mode for hardcopy */
+        ECHOCTL, /* echo control chars as ^(Char) */
+        ISIG, /* enable signals INTR, QUIT, [D]SUSP */
+        ICANON, /* canonicalize input lines */
+        ALTWERASE, /* use alternate WERASE algorithm */
+        IEXTEN, /* enable DISCARD and LNEXT */
+        EXTPROC, /* external processing */
+        TOSTOP, /* stop background jobs from output */
+        FLUSHO, /* output being flushed (state) */
+        NOKERNINFO, /* no kernel output from VSTATUS */
+        PENDIN, /* XXX retype pending input (state) */
+        NOFLSH /* don't flush after interrupt */
     }
 
     final EnumSet<InputFlag> iflag = EnumSet.noneOf(InputFlag.class);
@@ -135,9 +137,9 @@ public enum LocalFlag {
     final EnumSet<LocalFlag> lflag = EnumSet.noneOf(LocalFlag.class);
     final EnumMap<ControlChar, Integer> cchars = new EnumMap<>(ControlChar.class);
 
-    public Attributes() {
-    }
+    public Attributes() {}
 
+    @SuppressWarnings("this-escape")
     public Attributes(Attributes attr) {
         copy(attr);
     }
@@ -310,13 +312,12 @@ public void copy(Attributes attributes) {
 
     @Override
     public String toString() {
-        return "Attributes[" +
-                "lflags: " + append(lflag) + ", " +
-                "iflags: " + append(iflag) + ", " +
-                "oflags: " + append(oflag) + ", " +
-                "cflags: " + append(cflag) + ", " +
-                "cchars: " + append(EnumSet.allOf(ControlChar.class), this::display) +
-                "]";
+        return "Attributes[" + "lflags: "
+                + append(lflag) + ", " + "iflags: "
+                + append(iflag) + ", " + "oflags: "
+                + append(oflag) + ", " + "cflags: "
+                + append(cflag) + ", " + "cchars: "
+                + append(EnumSet.allOf(ControlChar.class), this::display) + "]";
     }
 
     private String display(ControlChar c) {
@@ -345,5 +346,4 @@ private <T extends Enum<T>> String append(EnumSet<T> set) {
     private <T extends Enum<T>> String append(EnumSet<T> set, Function<T, String> toString) {
         return set.stream().map(toString).collect(Collectors.joining(" "));
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Cursor.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Cursor.java
index c561349cb0ff0..9bc3d902849ed 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Cursor.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Cursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/MouseEvent.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/MouseEvent.java
index df59e3f41b250..059b43c51ae07 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/MouseEvent.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/MouseEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -71,12 +71,11 @@ public int getY() {
 
     @Override
     public String toString() {
-        return "MouseEvent[" +
-                "type=" + type +
-                ", button=" + button +
-                ", modifiers=" + modifiers +
-                ", x=" + x +
-                ", y=" + y +
-                ']';
+        return "MouseEvent[" + "type="
+                + type + ", button="
+                + button + ", modifiers="
+                + modifiers + ", x="
+                + x + ", y="
+                + y + ']';
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Size.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Size.java
index 29870ad626cd5..fde3bf35959ed 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Size.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Size.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,9 +13,9 @@ public class Size {
     private int rows;
     private int cols;
 
-    public Size() {
-    }
+    public Size() {}
 
+    @SuppressWarnings("this-escape")
     public Size(int columns, int rows) {
         this();
         setColumns(columns);
@@ -50,7 +50,7 @@ public void setRows(int rows) {
      * @return the cursor position
      */
     public int cursorPos(int row, int col) {
-        return row * (cols+1) + col;
+        return row * (cols + 1) + col;
     }
 
     public void copy(Size size) {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Terminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Terminal.java
index 38ffb029f604a..054915e133d2a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Terminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Terminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -34,6 +34,7 @@ public interface Terminal extends Closeable, Flushable {
      * Type used for dumb terminals.
      */
     String TYPE_DUMB = "dumb";
+
     String TYPE_DUMB_COLOR = "dumb-color";
 
     String getName();
@@ -42,6 +43,9 @@ public interface Terminal extends Closeable, Flushable {
     // Signal support
     //
 
+    /**
+     * Types of signals.
+     */
     enum Signal {
         INT,
         QUIT,
@@ -51,16 +55,55 @@ enum Signal {
         WINCH
     }
 
+    /**
+     * The SignalHandler defines the interface used to trap signals and perform specific behaviors.
+     * @see Terminal.Signal
+     * @see Terminal#handle(Signal, SignalHandler)
+     */
     interface SignalHandler {
 
+        /**
+         * The {@code SIG_DFL} value can be used to specify that the JVM default behavior
+         * should be used to handle this signal.
+         */
         SignalHandler SIG_DFL = NativeSignalHandler.SIG_DFL;
+
+        /**
+         * The {@code SIG_IGN} value can be used to ignore this signal and not perform
+         * any special processing.
+         */
         SignalHandler SIG_IGN = NativeSignalHandler.SIG_IGN;
 
+        /**
+         * Handle the signal.
+         * @param signal the signal
+         */
         void handle(Signal signal);
     }
 
+    /**
+     * Registers a handler for the given {@link Signal}.
+     * <p>
+     * Note that the JVM does not easily allow catching the {@link Signal#QUIT} signal, which causes a thread dump
+     * to be displayed.  This signal is mainly used when connecting through an SSH socket to a virtual terminal.
+     *
+     * @param signal the signal to register a handler for
+     * @param handler the handler
+     * @return the previous signal handler
+     */
     SignalHandler handle(Signal signal, SignalHandler handler);
 
+    /**
+     * Raise the specific signal.
+     * This is not method usually called by non system terminals.
+     * When accessing a terminal through a SSH or Telnet connection, signals may be
+     * conveyed by the protocol and thus need to be raised when reaching the terminal code.
+     * The terminals do that automatically when the terminal input stream has a character
+     * mapped to {@link Attributes.ControlChar#VINTR}, {@link Attributes.ControlChar#VQUIT},
+     * or {@link Attributes.ControlChar#VSUSP}.
+     *
+     * @param signal the signal to raise
+     */
     void raise(Signal signal);
 
     //
@@ -180,8 +223,21 @@ interface SignalHandler {
 
     boolean echo(boolean echo);
 
+    /**
+     * Returns the terminal attributes.
+     * The returned object can be safely modified
+     * further used in a call to {@link #setAttributes(Attributes)}.
+     *
+     * @return the terminal attributes.
+     */
     Attributes getAttributes();
 
+    /**
+     * Set the terminal attributes.
+     * The terminal will perform a copy of the given attributes.
+     *
+     * @param attr the new attributes
+     */
     void setAttributes(Attributes attr);
 
     /**
@@ -334,5 +390,4 @@ enum MouseTracking {
      * Color support
      */
     ColorPalette getPalette();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
index 014ad78b794d7..3b02ec2d8d8ac 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,9 +8,6 @@
  */
 package jdk.internal.org.jline.terminal;
 
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -19,11 +16,16 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -31,8 +33,10 @@
 
 import jdk.internal.org.jline.terminal.impl.AbstractPosixTerminal;
 import jdk.internal.org.jline.terminal.impl.AbstractTerminal;
-import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
 import jdk.internal.org.jline.terminal.impl.DumbTerminal;
+import jdk.internal.org.jline.terminal.impl.DumbTerminalProvider;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalExt;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.Log;
 import jdk.internal.org.jline.utils.OSUtils;
@@ -49,16 +53,30 @@ public final class TerminalBuilder {
     public static final String PROP_ENCODING = "org.jline.terminal.encoding";
     public static final String PROP_CODEPAGE = "org.jline.terminal.codepage";
     public static final String PROP_TYPE = "org.jline.terminal.type";
-    public static final String PROP_JNA = "org.jline.terminal.jna";
-    public static final String PROP_JANSI = "org.jline.terminal.jansi";
-    public static final String PROP_EXEC = "org.jline.terminal.exec";
-    public static final String PROP_DUMB = "org.jline.terminal.dumb";
+    public static final String PROP_PROVIDER = "org.jline.terminal.provider";
+    public static final String PROP_PROVIDERS = "org.jline.terminal.providers";
+    public static final String PROP_PROVIDER_FFM = "ffm";
+    public static final String PROP_PROVIDER_JNI = "jni";
+    public static final String PROP_PROVIDER_JANSI = "jansi";
+    public static final String PROP_PROVIDER_JNA = "jna";
+    public static final String PROP_PROVIDER_EXEC = "exec";
+    public static final String PROP_PROVIDER_DUMB = "dumb";
+    public static final String PROP_PROVIDERS_DEFAULT = String.join(
+            ",", PROP_PROVIDER_FFM, PROP_PROVIDER_JNI, PROP_PROVIDER_JANSI, PROP_PROVIDER_JNA, PROP_PROVIDER_EXEC);
+    public static final String PROP_FFM = "org.jline.terminal." + PROP_PROVIDER_FFM;
+    public static final String PROP_JNI = "org.jline.terminal." + PROP_PROVIDER_JNI;
+    public static final String PROP_JANSI = "org.jline.terminal." + PROP_PROVIDER_JANSI;
+    public static final String PROP_JNA = "org.jline.terminal." + PROP_PROVIDER_JNA;
+    public static final String PROP_EXEC = "org.jline.terminal." + PROP_PROVIDER_EXEC;
+    public static final String PROP_DUMB = "org.jline.terminal." + PROP_PROVIDER_DUMB;
     public static final String PROP_DUMB_COLOR = "org.jline.terminal.dumb.color";
     public static final String PROP_OUTPUT = "org.jline.terminal.output";
     public static final String PROP_OUTPUT_OUT = "out";
     public static final String PROP_OUTPUT_ERR = "err";
     public static final String PROP_OUTPUT_OUT_ERR = "out-err";
     public static final String PROP_OUTPUT_ERR_OUT = "err-out";
+    public static final String PROP_OUTPUT_FORCED_OUT = "forced-out";
+    public static final String PROP_OUTPUT_FORCED_ERR = "forced-err";
 
     //
     // Other system properties controlling various jline parts
@@ -68,6 +86,32 @@ public final class TerminalBuilder {
     public static final String PROP_COLOR_DISTANCE = "org.jline.utils.colorDistance";
     public static final String PROP_DISABLE_ALTERNATE_CHARSET = "org.jline.utils.disableAlternateCharset";
 
+    //
+    // System properties controlling how FileDescriptor are create.
+    // The value can be a comma separated list of defined mechanisms.
+    //
+    public static final String PROP_FILE_DESCRIPTOR_CREATION_MODE = "org.jline.terminal.pty.fileDescriptorCreationMode";
+    public static final String PROP_FILE_DESCRIPTOR_CREATION_MODE_NATIVE = "native";
+    public static final String PROP_FILE_DESCRIPTOR_CREATION_MODE_REFLECTION = "reflection";
+    public static final String PROP_FILE_DESCRIPTOR_CREATION_MODE_DEFAULT =
+            String.join(",", PROP_FILE_DESCRIPTOR_CREATION_MODE_REFLECTION, PROP_FILE_DESCRIPTOR_CREATION_MODE_NATIVE);
+
+    //
+    // System properties controlling how RedirectPipe are created.
+    // The value can be a comma separated list of defined mechanisms.
+    //
+    public static final String PROP_REDIRECT_PIPE_CREATION_MODE = "org.jline.terminal.exec.redirectPipeCreationMode";
+    public static final String PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE = "native";
+    public static final String PROP_REDIRECT_PIPE_CREATION_MODE_REFLECTION = "reflection";
+    public static final String PROP_REDIRECT_PIPE_CREATION_MODE_DEFAULT =
+            String.join(",", PROP_REDIRECT_PIPE_CREATION_MODE_REFLECTION, PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE);
+
+    public static final Set<String> DEPRECATED_PROVIDERS =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(PROP_PROVIDER_JNA, PROP_PROVIDER_JANSI)));
+
+    public static final String PROP_DISABLE_DEPRECATED_PROVIDER_WARNING =
+            "org.jline.terminal.disableDeprecatedProviderWarning";
+
     //
     // Terminal output control
     //
@@ -75,7 +119,9 @@ public enum SystemOutput {
         SysOut,
         SysErr,
         SysOutOrSysErr,
-        SysErrOrSysOut
+        SysErrOrSysOut,
+        ForcedSysOut,
+        ForcedSysErr
     }
 
     /**
@@ -115,20 +161,23 @@ public static TerminalBuilder builder() {
     private int codepage;
     private Boolean system;
     private SystemOutput systemOutput;
+    private String provider;
+    private String providers;
     private Boolean jna;
     private Boolean jansi;
+    private Boolean jni;
     private Boolean exec;
+    private Boolean ffm;
     private Boolean dumb;
     private Boolean color;
     private Attributes attributes;
     private Size size;
-    private boolean nativeSignals = false;
+    private boolean nativeSignals = true;
     private Function<InputStream, InputStream> inputStreamWrapper = in -> in;
     private Terminal.SignalHandler signalHandler = Terminal.SignalHandler.SIG_DFL;
     private boolean paused = false;
 
-    private TerminalBuilder() {
-    }
+    private TerminalBuilder() {}
 
     public TerminalBuilder name(String name) {
         this.name = name;
@@ -160,6 +209,16 @@ public TerminalBuilder systemOutput(SystemOutput systemOutput) {
         return this;
     }
 
+    public TerminalBuilder provider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    public TerminalBuilder providers(String providers) {
+        this.providers = providers;
+        return this;
+    }
+
     public TerminalBuilder jna(boolean jna) {
         this.jna = jna;
         return this;
@@ -170,11 +229,21 @@ public TerminalBuilder jansi(boolean jansi) {
         return this;
     }
 
+    public TerminalBuilder jni(boolean jni) {
+        this.jni = jni;
+        return this;
+    }
+
     public TerminalBuilder exec(boolean exec) {
         this.exec = exec;
         return this;
     }
 
+    public TerminalBuilder ffm(boolean ffm) {
+        this.ffm = ffm;
+        return this;
+    }
+
     public TerminalBuilder dumb(boolean dumb) {
         this.dumb = dumb;
         return this;
@@ -280,6 +349,12 @@ public TerminalBuilder nativeSignals(boolean nativeSignals) {
         return this;
     }
 
+    /**
+     * Determines the default value for signal handlers.
+     * All signals will be mapped to the given handler.
+     * @param signalHandler the default signal handler
+     * @return The builder
+     */
     public TerminalBuilder signalHandler(Terminal.SignalHandler signalHandler) {
         this.signalHandler = signalHandler;
         return this;
@@ -305,6 +380,11 @@ public TerminalBuilder paused(boolean paused) {
         return this;
     }
 
+    /**
+     * Builds the terminal.
+     * @return the newly created terminal, never {@code null}
+     * @throws IOException if an error occurs
+     */
     public Terminal build() throws IOException {
         Terminal override = TERMINAL_OVERRIDE.get();
         Terminal terminal = override != null ? override : doBuild();
@@ -313,7 +393,8 @@ public Terminal build() throws IOException {
         }
         Log.debug(() -> "Using terminal " + terminal.getClass().getSimpleName());
         if (terminal instanceof AbstractPosixTerminal) {
-            Log.debug(() -> "Using pty " + ((AbstractPosixTerminal) terminal).getPty().getClass().getSimpleName());
+            Log.debug(() -> "Using pty "
+                    + ((AbstractPosixTerminal) terminal).getPty().getClass().getSimpleName());
         }
         return terminal;
     }
@@ -323,144 +404,76 @@ private Terminal doBuild() throws IOException {
         if (name == null) {
             name = "JLine terminal";
         }
-        Charset encoding = this.encoding;
-        if (encoding == null) {
-            String charsetName = System.getProperty(PROP_ENCODING);
-            if (charsetName != null && Charset.isSupported(charsetName)) {
-                encoding = Charset.forName(charsetName);
-            }
-        }
-        if (encoding == null) {
-            int codepage = this.codepage;
-            if (codepage <= 0) {
-                String str = System.getProperty(PROP_CODEPAGE);
-                if (str != null) {
-                    codepage = Integer.parseInt(str);
-                }
-            }
-            if (codepage >= 0) {
-                encoding = getCodepageCharset(codepage);
-            } else {
-                encoding = StandardCharsets.UTF_8;
-            }
-        }
-        String type = this.type;
-        if (type == null) {
-            type = System.getProperty(PROP_TYPE);
-        }
-        if (type == null) {
-            type = System.getenv("TERM");
-        }
-        Boolean jna = this.jna;
-        if (jna == null) {
-            jna = getBoolean(PROP_JNA, true);
-        }
-        Boolean jansi = this.jansi;
-        if (jansi == null) {
-            jansi = getBoolean(PROP_JANSI, true);
-        }
-        Boolean exec = this.exec;
-        if (exec == null) {
-            exec = getBoolean(PROP_EXEC, true);
+        Charset encoding = computeEncoding();
+        String type = computeType();
+
+        String provider = this.provider;
+        if (provider == null) {
+            provider = System.getProperty(PROP_PROVIDER, null);
         }
+
+        boolean forceDumb =
+                (DumbTerminal.TYPE_DUMB.equals(type) || type != null && type.startsWith(DumbTerminal.TYPE_DUMB_COLOR))
+                        || (provider != null && provider.equals(PROP_PROVIDER_DUMB));
         Boolean dumb = this.dumb;
         if (dumb == null) {
             dumb = getBoolean(PROP_DUMB, null);
         }
         IllegalStateException exception = new IllegalStateException("Unable to create a terminal");
-        List<TerminalProvider> providers = new ArrayList<>();
-        if (jna) {
-            try {
-                TerminalProvider provider = TerminalProvider.load("jna");
-                providers.add(provider);
-            }  catch (Throwable t) {
-                Log.debug("Unable to load JNA support: ", t);
-                exception.addSuppressed(t);
-            }
-        }
-        if (jansi) {
-            try {
-                TerminalProvider provider = TerminalProvider.load("jansi");
-                providers.add(provider);
-            }  catch (Throwable t) {
-                Log.debug("Unable to load JANSI support: ", t);
-                exception.addSuppressed(t);
-            }
-        }
-        if (exec)
-        {
-            try {
-                TerminalProvider provider = TerminalProvider.load("exec");
-                providers.add(provider);
-            }  catch (Throwable t) {
-                Log.debug("Unable to load EXEC support: ", t);
-                exception.addSuppressed(t);
-            }
-        }
-
+        List<TerminalProvider> providers = getProviders(provider, exception);
         Terminal terminal = null;
         if ((system != null && system) || (system == null && in == null && out == null)) {
-            if (system != null && ((in != null && !in.equals(System.in)) ||
-                    (out != null && !out.equals(System.out) && !out.equals(System.err)))) {
+            if (system != null
+                    && ((in != null && !in.equals(System.in))
+                            || (out != null && !out.equals(System.out) && !out.equals(System.err)))) {
                 throw new IllegalArgumentException("Cannot create a system terminal using non System streams");
             }
             if (attributes != null || size != null) {
                 Log.warn("Attributes and size fields are ignored when creating a system terminal");
             }
-            if (out != null) {
-                if (out.equals(System.out)) {
-                    systemOutput = SystemOutput.SysOut;
-                } else if (out.equals(System.err)) {
-                    systemOutput = SystemOutput.SysErr;
-                }
-            }
-            if (systemOutput == null) {
-                String str = System.getProperty(PROP_OUTPUT);
-                if (str != null) {
-                    switch (str.trim().toLowerCase(Locale.ROOT)) {
-                        case PROP_OUTPUT_OUT: systemOutput = SystemOutput.SysOut; break;
-                        case PROP_OUTPUT_ERR: systemOutput = SystemOutput.SysErr; break;
-                        case PROP_OUTPUT_OUT_ERR: systemOutput = SystemOutput.SysOutOrSysErr; break;
-                        case PROP_OUTPUT_ERR_OUT: systemOutput = SystemOutput.SysErrOrSysOut; break;
-                        default:
-                            Log.debug("Unsupported value for " + PROP_OUTPUT + ": " + str + ". Supported values are: "
-                                    + String.join(", ", PROP_OUTPUT_OUT, PROP_OUTPUT_ERR, PROP_OUTPUT_OUT_ERR,PROP_OUTPUT_ERR_OUT)
-                                    + ".");
-                    }
-                }
-            }
-            if (systemOutput == null) {
-                systemOutput = SystemOutput.SysOutOrSysErr;
-            }
-            Map<TerminalProvider.Stream, Boolean> system = Stream.of(TerminalProvider.Stream.values())
-                    .collect(Collectors.toMap(stream -> stream, stream -> providers.stream().anyMatch(p -> p.isSystemStream(stream))));
-            TerminalProvider.Stream console = select(system, systemOutput);
+            SystemOutput systemOutput = computeSystemOutput();
+            Map<SystemStream, Boolean> system = Stream.of(SystemStream.values())
+                    .collect(Collectors.toMap(
+                            stream -> stream, stream -> providers.stream().anyMatch(p -> p.isSystemStream(stream))));
+            SystemStream systemStream = select(system, systemOutput);
 
-            if (system.get(TerminalProvider.Stream.Input) && console != null) {
+            if (!forceDumb && system.get(SystemStream.Input) && systemStream != null) {
                 if (attributes != null || size != null) {
                     Log.warn("Attributes and size fields are ignored when creating a system terminal");
                 }
                 boolean ansiPassThrough = OSUtils.IS_CONEMU;
                 // Cygwin defaults to XTERM, but actually supports 256 colors,
                 // so if the value comes from the environment, change it to xterm-256color
-                if ((OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM)  && "xterm".equals(type)
-                        && this.type == null && System.getProperty(PROP_TYPE) == null) {
+                if ((OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM)
+                        && "xterm".equals(type)
+                        && this.type == null
+                        && System.getProperty(PROP_TYPE) == null) {
                     type = "xterm-256color";
                 }
-                for ( TerminalProvider provider : providers) {
+                for (TerminalProvider prov : providers) {
                     if (terminal == null) {
                         try {
-                            terminal = provider.sysTerminal(name, type, ansiPassThrough, encoding,
-                                    nativeSignals, signalHandler, paused, console, inputStreamWrapper);
+                            terminal = prov.sysTerminal(
+                                    name,
+                                    type,
+                                    ansiPassThrough,
+                                    encoding,
+                                    nativeSignals,
+                                    signalHandler,
+                                    paused,
+                                    systemStream,
+                                    inputStreamWrapper);
                         } catch (Throwable t) {
-                            Log.debug("Error creating " + provider.name() + " based terminal: ", t.getMessage(), t);
+                            Log.debug("Error creating " + prov.name() + " based terminal: ", t.getMessage(), t);
                             exception.addSuppressed(t);
                         }
                     }
                 }
-                if (terminal == null && OSUtils.IS_WINDOWS &&  !jna && !jansi && (dumb == null || !dumb)) {
-                    throw new IllegalStateException("Unable to create a system terminal. On windows, either "
-                            + "JNA or JANSI library is required.  Make sure to add one of those in the classpath.");
+                if (terminal == null && OSUtils.IS_WINDOWS && providers.isEmpty() && (dumb == null || !dumb)) {
+                    throw new IllegalStateException(
+                            "Unable to create a system terminal. On Windows, either JLine's native libraries, JNA "
+                                    + "or Jansi library is required.  Make sure to add one of those in the classpath.",
+                            exception);
                 }
             }
             if (terminal instanceof AbstractTerminal) {
@@ -468,55 +481,42 @@ private Terminal doBuild() throws IOException {
                 if (SYSTEM_TERMINAL.compareAndSet(null, t)) {
                     t.setOnClose(() -> SYSTEM_TERMINAL.compareAndSet(t, null));
                 } else {
-                    exception.addSuppressed(new IllegalStateException("A system terminal is already running. " +
-                            "Make sure to use the created system Terminal on the LineReaderBuilder if you're using one " +
-                            "or that previously created system Terminals have been correctly closed."));
+                    exception.addSuppressed(new IllegalStateException("A system terminal is already running. "
+                            + "Make sure to use the created system Terminal on the LineReaderBuilder if you're using one "
+                            + "or that previously created system Terminals have been correctly closed."));
                     terminal.close();
                     terminal = null;
                 }
             }
-            if (terminal == null && (dumb == null || dumb)) {
-                // forced colored dumb terminal
-                Boolean color = this.color;
-                if (color == null) {
-                    color = getBoolean(PROP_DUMB_COLOR, false);
-                    // detect emacs using the env variable
-                    if (!color) {
-                        String emacs = System.getenv("INSIDE_EMACS");
-                        color = emacs != null && emacs.contains("comint");
-                    }
-                    // detect Intellij Idea
-                    if (!color) {
-                        String command = getParentProcessCommand();
-                        color = command != null && command.contains("idea");
-                    }
-                    if (!color) {
-                        color = system.get(TerminalProvider.Stream.Output) && System.getenv("TERM") != null;
-                    }
-                    if (!color && dumb == null) {
-                        if (Log.isDebugEnabled()) {
-                            Log.warn("input is tty: {}", system.get(TerminalProvider.Stream.Input));
-                            Log.warn("output is tty: {}", system.get(TerminalProvider.Stream.Output));
-                            Log.warn("error is tty: {}", system.get(TerminalProvider.Stream.Error));
-                            Log.warn("Creating a dumb terminal", exception);
-                        } else {
-                            Log.warn("Unable to create a system terminal, creating a dumb terminal (enable debug logging for more information)");
-                        }
+            if (terminal == null && (forceDumb || dumb == null || dumb)) {
+                if (!forceDumb && dumb == null) {
+                    if (Log.isDebugEnabled()) {
+                        Log.warn("input is tty: " + system.get(SystemStream.Input));
+                        Log.warn("output is tty: " + system.get(SystemStream.Output));
+                        Log.warn("error is tty: " + system.get(SystemStream.Error));
+                        Log.warn("Creating a dumb terminal", exception);
+                    } else {
+                        Log.warn(
+                                "Unable to create a system terminal, creating a dumb terminal (enable debug logging for more information)");
                     }
                 }
-                terminal = new DumbTerminal(name, color ? Terminal.TYPE_DUMB_COLOR : Terminal.TYPE_DUMB,
-                        new FileInputStream(FileDescriptor.in),
-                        //JDK change: always write into stdout:
-                        new FileOutputStream(FileDescriptor.out),
-                        encoding, signalHandler);
+                type = getDumbTerminalType(dumb, systemStream);
+                terminal = new DumbTerminalProvider()
+                        .sysTerminal(name, type, false, encoding, nativeSignals, signalHandler, paused, systemStream, inputStreamWrapper);
+                if (OSUtils.IS_WINDOWS) {
+                    Attributes attr = terminal.getAttributes();
+                    attr.setInputFlag(Attributes.InputFlag.IGNCR, true);
+                    terminal.setAttributes(attr);
+                }
             }
         } else {
-            for ( TerminalProvider provider : providers) {
+            for (TerminalProvider prov : providers) {
                 if (terminal == null) {
                     try {
-                        terminal = provider.newTerminal(name, type, inputStreamWrapper.apply(in), out, encoding, signalHandler, paused, attributes, size);
+                        terminal = prov.newTerminal(
+                                name, type, in, out, encoding, signalHandler, paused, attributes, size);
                     } catch (Throwable t) {
-                        Log.debug("Error creating " + provider.name() + " based terminal: ", t.getMessage(), t);
+                        Log.debug("Error creating " + prov.name() + " based terminal: ", t.getMessage(), t);
                         exception.addSuppressed(t);
                     }
                 }
@@ -525,25 +525,220 @@ private Terminal doBuild() throws IOException {
         if (terminal == null) {
             throw exception;
         }
+        if (terminal instanceof TerminalExt) {
+            TerminalExt te = (TerminalExt) terminal;
+            if (DEPRECATED_PROVIDERS.contains(te.getProvider().name())
+                    && !getBoolean(PROP_DISABLE_DEPRECATED_PROVIDER_WARNING, false)) {
+                Log.warn("The terminal provider " + te.getProvider().name()
+                        + " has been deprecated, check your configuration. This warning can be disabled by setting the system property "
+                        + PROP_DISABLE_DEPRECATED_PROVIDER_WARNING + " to true.");
+            }
+        }
         return terminal;
     }
 
-    private TerminalProvider.Stream select(Map<TerminalProvider.Stream, Boolean> system, SystemOutput systemOutput) {
+    private String getDumbTerminalType(Boolean dumb, SystemStream systemStream) {
+        // forced colored dumb terminal
+        Boolean color = this.color;
+        if (color == null) {
+            color = getBoolean(PROP_DUMB_COLOR, null);
+        }
+        if (dumb == null) {
+            // detect emacs using the env variable
+            if (color == null) {
+                String emacs = System.getenv("INSIDE_EMACS");
+                if (emacs != null && emacs.contains("comint")) {
+                    color = true;
+                }
+            }
+            // detect Intellij Idea
+            if (color == null) {
+                // using the env variable on windows
+                String ideHome = System.getenv("IDE_HOME");
+                if (ideHome != null) {
+                    color = true;
+                } else {
+                    // using the parent process command on unix/mac
+                    String command = getParentProcessCommand();
+                    if (command != null && command.endsWith("/idea")) {
+                        color = true;
+                    }
+                }
+            }
+            if (color == null) {
+                color = systemStream != null && System.getenv("TERM") != null;
+            }
+        } else {
+            if (color == null) {
+                color = false;
+            }
+        }
+        return color ? Terminal.TYPE_DUMB_COLOR : Terminal.TYPE_DUMB;
+    }
+
+    public SystemOutput computeSystemOutput() {
+        SystemOutput systemOutput = null;
+        if (out != null) {
+            if (out.equals(System.out)) {
+                systemOutput = SystemOutput.SysOut;
+            } else if (out.equals(System.err)) {
+                systemOutput = SystemOutput.SysErr;
+            }
+        }
+        if (systemOutput == null) {
+            systemOutput = this.systemOutput;
+        }
+        if (systemOutput == null) {
+            String str = System.getProperty(PROP_OUTPUT);
+            if (str != null) {
+                switch (str.trim().toLowerCase(Locale.ROOT)) {
+                    case PROP_OUTPUT_OUT:
+                        systemOutput = SystemOutput.SysOut;
+                        break;
+                    case PROP_OUTPUT_ERR:
+                        systemOutput = SystemOutput.SysErr;
+                        break;
+                    case PROP_OUTPUT_OUT_ERR:
+                        systemOutput = SystemOutput.SysOutOrSysErr;
+                        break;
+                    case PROP_OUTPUT_ERR_OUT:
+                        systemOutput = SystemOutput.SysErrOrSysOut;
+                        break;
+                    case PROP_OUTPUT_FORCED_OUT:
+                        systemOutput = SystemOutput.ForcedSysOut;
+                        break;
+                    case PROP_OUTPUT_FORCED_ERR:
+                        systemOutput = SystemOutput.ForcedSysErr;
+                        break;
+                    default:
+                        Log.debug("Unsupported value for " + PROP_OUTPUT + ": " + str + ". Supported values are: "
+                                + String.join(
+                                        ", ",
+                                        PROP_OUTPUT_OUT,
+                                        PROP_OUTPUT_ERR,
+                                        PROP_OUTPUT_OUT_ERR,
+                                        PROP_OUTPUT_ERR_OUT)
+                                + ".");
+                }
+            }
+        }
+        if (systemOutput == null) {
+            systemOutput = SystemOutput.SysOutOrSysErr;
+        }
+        return systemOutput;
+    }
+
+    public String computeType() {
+        String type = this.type;
+        if (type == null) {
+            type = System.getProperty(PROP_TYPE);
+        }
+        if (type == null) {
+            type = System.getenv("TERM");
+        }
+        return type;
+    }
+
+    public Charset computeEncoding() {
+        Charset encoding = this.encoding;
+        if (encoding == null) {
+            String charsetName = System.getProperty(PROP_ENCODING);
+            if (charsetName != null && Charset.isSupported(charsetName)) {
+                encoding = Charset.forName(charsetName);
+            }
+        }
+        if (encoding == null) {
+            int codepage = this.codepage;
+            if (codepage <= 0) {
+                String str = System.getProperty(PROP_CODEPAGE);
+                if (str != null) {
+                    codepage = Integer.parseInt(str);
+                }
+            }
+            if (codepage >= 0) {
+                encoding = getCodepageCharset(codepage);
+            } else {
+                encoding = StandardCharsets.UTF_8;
+            }
+        }
+        return encoding;
+    }
+
+    /**
+     * Get the list of available terminal providers.
+     * This list is sorted according to the {@link #PROP_PROVIDERS} system property.
+     * @param provider if not {@code null}, only this provider will be checked
+     * @param exception if a provider throws an exception, it will be added to this exception as a suppressed exception
+     * @return a list of terminal providers
+     */
+    public List<TerminalProvider> getProviders(String provider, IllegalStateException exception) {
+        List<TerminalProvider> providers = new ArrayList<>();
+        // Check ffm provider
+        checkProvider(provider, exception, providers, ffm, PROP_FFM, PROP_PROVIDER_FFM);
+        // Check jni provider
+        checkProvider(provider, exception, providers, jni, PROP_JNI, PROP_PROVIDER_JNI);
+        // Check jansi provider
+        checkProvider(provider, exception, providers, jansi, PROP_JANSI, PROP_PROVIDER_JANSI);
+        // Check jna provider
+        checkProvider(provider, exception, providers, jna, PROP_JNA, PROP_PROVIDER_JNA);
+        // Check exec provider
+        checkProvider(provider, exception, providers, exec, PROP_EXEC, PROP_PROVIDER_EXEC);
+        // Order providers
+        List<String> order = Arrays.asList(
+                (this.providers != null ? this.providers : System.getProperty(PROP_PROVIDERS, PROP_PROVIDERS_DEFAULT))
+                        .split(","));
+        providers.sort(Comparator.comparing(l -> {
+            int idx = order.indexOf(l.name());
+            return idx >= 0 ? idx : Integer.MAX_VALUE;
+        }));
+        String names = providers.stream().map(TerminalProvider::name).collect(Collectors.joining(", "));
+        Log.debug("Available providers: " + names);
+        return providers;
+    }
+
+    private void checkProvider(
+            String provider,
+            IllegalStateException exception,
+            List<TerminalProvider> providers,
+            Boolean load,
+            String property,
+            String name) {
+        Boolean doLoad = provider != null ? (Boolean) name.equals(provider) : load;
+        if (doLoad == null) {
+            doLoad = getBoolean(property, true);
+        }
+        if (doLoad) {
+            try {
+                TerminalProvider prov = TerminalProvider.load(name);
+                prov.isSystemStream(SystemStream.Output);
+                providers.add(prov);
+            } catch (Throwable t) {
+                Log.debug("Unable to load " + name + " provider: ", t);
+                exception.addSuppressed(t);
+            }
+        }
+    }
+
+    private SystemStream select(Map<SystemStream, Boolean> system, SystemOutput systemOutput) {
         switch (systemOutput) {
             case SysOut:
-                return select(system, TerminalProvider.Stream.Output);
+                return select(system, SystemStream.Output);
             case SysErr:
-                return select(system, TerminalProvider.Stream.Error);
+                return select(system, SystemStream.Error);
             case SysOutOrSysErr:
-                return select(system, TerminalProvider.Stream.Output, TerminalProvider.Stream.Error);
+                return select(system, SystemStream.Output, SystemStream.Error);
             case SysErrOrSysOut:
-                return select(system, TerminalProvider.Stream.Error, TerminalProvider.Stream.Output);
+                return select(system, SystemStream.Error, SystemStream.Output);
+            case ForcedSysOut:
+                return SystemStream.Output;
+            case ForcedSysErr:
+                return SystemStream.Error;
         }
         return null;
     }
 
-    private static TerminalProvider.Stream select(Map<TerminalProvider.Stream, Boolean> system, TerminalProvider.Stream... streams) {
-        for (TerminalProvider.Stream s : streams) {
+    private static SystemStream select(Map<SystemStream, Boolean> system, SystemStream... streams) {
+        for (SystemStream s : streams) {
             if (system.get(s)) {
                 return s;
             }
@@ -558,7 +753,9 @@ private static String getParentProcessCommand() {
             Object parent = ((Optional<?>) phClass.getMethod("parent").invoke(current)).orElse(null);
             Method infoMethod = phClass.getMethod("info");
             Object info = infoMethod.invoke(parent);
-            Object command = ((Optional<?>) infoMethod.getReturnType().getMethod("command").invoke(info)).orElse(null);
+            Object command = ((Optional<?>)
+                            infoMethod.getReturnType().getMethod("command").invoke(info))
+                    .orElse(null);
             return (String) command;
         } catch (Throwable t) {
             return null;
@@ -583,7 +780,7 @@ private static <S> S load(Class<S> clazz) {
     private static final int UTF8_CODE_PAGE = 65001;
 
     private static Charset getCodepageCharset(int codepage) {
-        //http://docs.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html
+        // http://docs.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html
         if (codepage == UTF8_CODE_PAGE) {
             return StandardCharsets.UTF_8;
         }
@@ -630,5 +827,4 @@ private static Charset getCodepageCharset(int codepage) {
     public static void setTerminalOverride(final Terminal terminal) {
         TERMINAL_OVERRIDE.set(terminal);
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
index b5f55b80f1e31..5d000d070837b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,6 +18,8 @@
 import jdk.internal.org.jline.terminal.Cursor;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 
 public abstract class AbstractPosixTerminal extends AbstractTerminal {
 
@@ -28,7 +30,8 @@ public AbstractPosixTerminal(String name, String type, Pty pty) throws IOExcepti
         this(name, type, pty, null, SignalHandler.SIG_DFL);
     }
 
-    public AbstractPosixTerminal(String name, String type, Pty pty, Charset encoding, SignalHandler signalHandler) throws IOException {
+    public AbstractPosixTerminal(String name, String type, Pty pty, Charset encoding, SignalHandler signalHandler)
+            throws IOException {
         super(name, type, encoding, signalHandler);
         Objects.requireNonNull(pty);
         this.pty = pty;
@@ -82,4 +85,13 @@ public Cursor getCursorPosition(IntConsumer discarded) {
         return CursorSupport.getCursorPosition(this, discarded);
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return getPty().getProvider();
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return getPty().getSystemStream();
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPty.java
index 0feab84fc7e99..3fbe63f3c5d6b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPty.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,20 +8,39 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.spi.Pty;
-import jdk.internal.org.jline.utils.NonBlockingInputStream;
-
+import java.io.FileDescriptor;
+import java.io.FilterInputStream;
 import java.io.IOError;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
+import java.lang.reflect.Field;
+
+//import jdk.internal.org.jline.nativ.JLineLibrary;
+//import jdk.internal.org.jline.nativ.JLineNativeLoader;
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.utils.NonBlockingInputStream;
 
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_FILE_DESCRIPTOR_CREATION_MODE;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_FILE_DESCRIPTOR_CREATION_MODE_DEFAULT;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_FILE_DESCRIPTOR_CREATION_MODE_NATIVE;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_FILE_DESCRIPTOR_CREATION_MODE_REFLECTION;
 import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_NON_BLOCKING_READS;
 
 public abstract class AbstractPty implements Pty {
 
+    protected final TerminalProvider provider;
+    protected final SystemStream systemStream;
     private Attributes current;
+    private boolean skipNextLf;
+
+    public AbstractPty(TerminalProvider provider, SystemStream systemStream) {
+        this.provider = provider;
+        this.systemStream = systemStream;
+    }
 
     @Override
     public void setAttr(Attributes attr) throws IOException {
@@ -32,10 +51,32 @@ public void setAttr(Attributes attr) throws IOException {
     @Override
     public InputStream getSlaveInput() throws IOException {
         InputStream si = doGetSlaveInput();
+        InputStream nsi = new FilterInputStream(si) {
+            @Override
+            public int read() throws IOException {
+                for (; ; ) {
+                    int c = super.read();
+                    if (current.getInputFlag(Attributes.InputFlag.INORMEOL)) {
+                        if (c == '\r') {
+                            skipNextLf = true;
+                            c = '\n';
+                        } else if (c == '\n') {
+                            if (skipNextLf) {
+                                skipNextLf = false;
+                                continue;
+                            }
+                        } else {
+                            skipNextLf = false;
+                        }
+                    }
+                    return c;
+                }
+            }
+        };
         if (Boolean.parseBoolean(System.getProperty(PROP_NON_BLOCKING_READS, "true"))) {
-            return new PtyInputStream(si);
+            return new PtyInputStream(nsi);
         } else {
-            return si;
+            return nsi;
         }
     }
 
@@ -49,6 +90,16 @@ protected void checkInterrupted() throws InterruptedIOException {
         }
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return provider;
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return systemStream;
+    }
+
     class PtyInputStream extends NonBlockingInputStream {
         final InputStream in;
         int c = 0;
@@ -102,4 +153,103 @@ private void setNonBlocking() {
         }
     }
 
+    private static FileDescriptorCreator fileDescriptorCreator;
+
+    protected static FileDescriptor newDescriptor(int fd) {
+        if (fileDescriptorCreator == null) {
+            String str =
+                    System.getProperty(PROP_FILE_DESCRIPTOR_CREATION_MODE, PROP_FILE_DESCRIPTOR_CREATION_MODE_DEFAULT);
+            String[] modes = str.split(",");
+            IllegalStateException ise = new IllegalStateException("Unable to create FileDescriptor");
+            for (String mode : modes) {
+                try {
+                    switch (mode) {
+                        case PROP_FILE_DESCRIPTOR_CREATION_MODE_NATIVE:
+                            fileDescriptorCreator = null;//new NativeFileDescriptorCreator();
+                            break;
+                        case PROP_FILE_DESCRIPTOR_CREATION_MODE_REFLECTION:
+                            fileDescriptorCreator = new ReflectionFileDescriptorCreator();
+                            break;
+                    }
+                } catch (Throwable t) {
+                    // ignore
+                    ise.addSuppressed(t);
+                }
+                if (fileDescriptorCreator != null) {
+                    break;
+                }
+            }
+            if (fileDescriptorCreator == null) {
+                throw ise;
+            }
+        }
+        return fileDescriptorCreator.newDescriptor(fd);
+    }
+
+    interface FileDescriptorCreator {
+        FileDescriptor newDescriptor(int fd);
+    }
+
+    /*
+     * Class that could be used on OpenJDK 17.  However, it requires the following JVM option
+     *   --add-exports java.base/jdk.internal.access=ALL-UNNAMED
+     * so the benefit does not seem important enough to warrant the problems caused
+     * by access the jdk.internal.access package at compile time, which itself requires
+     * custom compiler options and a different maven module, or at least a different compile
+     * phase with a JDK 17 compiler.
+     * So, just keep the ReflectionFileDescriptorCreator for now.
+     *
+    static class Jdk17FileDescriptorCreator implements FileDescriptorCreator {
+        private final jdk.internal.access.JavaIOFileDescriptorAccess fdAccess;
+        Jdk17FileDescriptorCreator() {
+            fdAccess = jdk.internal.access.SharedSecrets.getJavaIOFileDescriptorAccess();
+        }
+
+        @Override
+        public FileDescriptor newDescriptor(int fd) {
+            FileDescriptor descriptor = new FileDescriptor();
+            fdAccess.set(descriptor, fd);
+            return descriptor;
+        }
+    }
+     */
+
+    /**
+     * Reflection based file descriptor creator.
+     * This requires the following option
+     *   --add-opens java.base/java.io=ALL-UNNAMED
+     */
+    static class ReflectionFileDescriptorCreator implements FileDescriptorCreator {
+        private final Field fileDescriptorField;
+
+        ReflectionFileDescriptorCreator() throws Exception {
+            Field field = FileDescriptor.class.getDeclaredField("fd");
+            field.setAccessible(true);
+            fileDescriptorField = field;
+        }
+
+        @Override
+        public FileDescriptor newDescriptor(int fd) {
+            FileDescriptor descriptor = new FileDescriptor();
+            try {
+                fileDescriptorField.set(descriptor, fd);
+            } catch (IllegalAccessException e) {
+                // This should not happen as the field has been set accessible
+                throw new IllegalStateException(e);
+            }
+            return descriptor;
+        }
+    }
+
+//    static class NativeFileDescriptorCreator implements FileDescriptorCreator {
+//        NativeFileDescriptorCreator() {
+//            // Force load the library
+//            JLineNativeLoader.initialize();
+//        }
+//
+//        @Override
+//        public FileDescriptor newDescriptor(int fd) {
+//            return JLineLibrary.newFileDescriptor(fd);
+//        }
+//    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
index 8a464a6726565..2608e2e5f37c5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -27,7 +27,7 @@
 import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
 import jdk.internal.org.jline.terminal.Cursor;
 import jdk.internal.org.jline.terminal.MouseEvent;
-import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.spi.TerminalExt;
 import jdk.internal.org.jline.utils.ColorPalette;
 import jdk.internal.org.jline.utils.Curses;
 import jdk.internal.org.jline.utils.InfoCmp;
@@ -35,7 +35,7 @@
 import jdk.internal.org.jline.utils.Log;
 import jdk.internal.org.jline.utils.Status;
 
-public abstract class AbstractTerminal implements Terminal {
+public abstract class AbstractTerminal implements TerminalExt {
 
     protected final String name;
     protected final String type;
@@ -44,7 +44,7 @@ public abstract class AbstractTerminal implements Terminal {
     protected final Set<Capability> bools = new HashSet<>();
     protected final Map<Capability, Integer> ints = new HashMap<>();
     protected final Map<Capability, String> strings = new HashMap<>();
-    protected final ColorPalette palette = new ColorPalette(this);
+    protected final ColorPalette palette;
     protected Status status;
     protected Runnable onClose;
 
@@ -52,10 +52,13 @@ public AbstractTerminal(String name, String type) throws IOException {
         this(name, type, null, SignalHandler.SIG_DFL);
     }
 
-    public AbstractTerminal(String name, String type, Charset encoding, SignalHandler signalHandler) throws IOException {
+    @SuppressWarnings("this-escape")
+    public AbstractTerminal(String name, String type, Charset encoding, SignalHandler signalHandler)
+            throws IOException {
         this.name = name;
         this.type = type != null ? type : "ansi";
         this.encoding = encoding != null ? encoding : System.out.charset();
+        this.palette = new ColorPalette(this);
         for (Signal signal : Signal.values()) {
             handlers.put(signal, signalHandler);
         }
@@ -85,12 +88,13 @@ public SignalHandler handle(Signal signal, SignalHandler handler) {
     public void raise(Signal signal) {
         Objects.requireNonNull(signal);
         SignalHandler handler = handlers.get(signal);
-        if (handler != SignalHandler.SIG_DFL && handler != SignalHandler.SIG_IGN) {
+        if (handler == SignalHandler.SIG_DFL) {
+            if (status != null && signal == Signal.WINCH) {
+                status.resize();
+            }
+        } else if (handler != SignalHandler.SIG_IGN) {
             handler.handle(signal);
         }
-        if (status != null && signal == Signal.WINCH) {
-            status.resize();
-        }
     }
 
     public final void close() throws IOException {
@@ -105,8 +109,7 @@ public final void close() throws IOException {
 
     protected void doClose() throws IOException {
         if (status != null) {
-            status.update(null);
-            flush();
+            status.close();
         }
     }
 
@@ -126,7 +129,7 @@ protected void echoSignal(Signal signal) {
         if (cc != null) {
             int vcc = getAttributes().getControlChar(cc);
             if (vcc > 0 && vcc < 32) {
-                writer().write(new char[]{'^', (char) (vcc + '@')}, 0, 2);
+                writer().write(new char[] {'^', (char) (vcc + '@')}, 0, 2);
             }
         }
     }
@@ -217,8 +220,7 @@ public Cursor getCursorPosition(IntConsumer discarded) {
     }
 
     private MouseEvent lastMouseEvent = new MouseEvent(
-                MouseEvent.Type.Moved, MouseEvent.Button.NoButton,
-                EnumSet.noneOf(MouseEvent.Modifier.class), 0, 0);
+            MouseEvent.Type.Moved, MouseEvent.Button.NoButton, EnumSet.noneOf(MouseEvent.Modifier.class), 0, 0);
 
     @Override
     public boolean hasMouseSupport() {
@@ -268,16 +270,13 @@ public boolean canPauseResume() {
     }
 
     @Override
-    public void pause() {
-    }
+    public void pause() {}
 
     @Override
-    public void pause(boolean wait) throws InterruptedException {
-    }
+    public void pause(boolean wait) throws InterruptedException {}
 
     @Override
-    public void resume() {
-    }
+    public void resume() {}
 
     @Override
     public boolean paused() {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java
index 0c36902a1a772..301b89eb7963f 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -29,11 +29,8 @@ public void write(char[] cbuf, int off, int len) throws IOException {
     }
 
     @Override
-    public void flush() {
-    }
+    public void flush() {}
 
     @Override
-    public void close() {
-    }
-
+    public void close() {}
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java
index 57cfb5d50b431..03c42fb19f7de 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2023, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,8 +8,20 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.Curses;
 import jdk.internal.org.jline.utils.InfoCmp;
 import jdk.internal.org.jline.utils.Log;
@@ -21,17 +33,6 @@
 import jdk.internal.org.jline.utils.Signals;
 import jdk.internal.org.jline.utils.WriterOutputStream;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
 /**
  * The AbstractWindowsTerminal is used as the base class for windows terminal.
  * Due to windows limitations, mostly the missing support for ansi sequences,
@@ -44,7 +45,7 @@
  * the writer() becomes the primary output, while the output() is bridged
  * to the writer() using a WriterOutputStream wrapper.
  */
-public abstract class AbstractWindowsTerminal extends AbstractTerminal {
+public abstract class AbstractWindowsTerminal<Console> extends AbstractTerminal {
 
     public static final String TYPE_WINDOWS = "windows";
     public static final String TYPE_WINDOWS_256_COLOR = "windows-256color";
@@ -56,12 +57,13 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
     private static final int UTF8_CODE_PAGE = 65001;
 
     protected static final int ENABLE_PROCESSED_INPUT = 0x0001;
-    protected static final int ENABLE_LINE_INPUT      = 0x0002;
-    protected static final int ENABLE_ECHO_INPUT      = 0x0004;
-    protected static final int ENABLE_WINDOW_INPUT    = 0x0008;
-    protected static final int ENABLE_MOUSE_INPUT     = 0x0010;
-    protected static final int ENABLE_INSERT_MODE     = 0x0020;
+    protected static final int ENABLE_LINE_INPUT = 0x0002;
+    protected static final int ENABLE_ECHO_INPUT = 0x0004;
+    protected static final int ENABLE_WINDOW_INPUT = 0x0008;
+    protected static final int ENABLE_MOUSE_INPUT = 0x0010;
+    protected static final int ENABLE_INSERT_MODE = 0x0020;
     protected static final int ENABLE_QUICK_EDIT_MODE = 0x0040;
+    protected static final int ENABLE_EXTENDED_FLAGS = 0x0080;
 
     protected final Writer slaveInputPipe;
     protected final InputStream input;
@@ -71,7 +73,12 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
     protected final Map<Signal, Object> nativeHandlers = new HashMap<>();
     protected final ShutdownHooks.Task closer;
     protected final Attributes attributes = new Attributes();
-    protected final int originalConsoleMode;
+    protected final Console inConsole;
+    protected final Console outConsole;
+    protected final int originalInConsoleMode;
+    protected final int originalOutConsoleMode;
+    private final TerminalProvider provider;
+    private final SystemStream systemStream;
 
     protected final Object lock = new Object();
     protected boolean paused = true;
@@ -80,21 +87,42 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
     protected MouseTracking tracking = MouseTracking.Off;
     protected boolean focusTracking = false;
     private volatile boolean closing;
-
-    public AbstractWindowsTerminal(Writer writer, String name, String type, Charset encoding, boolean nativeSignals, SignalHandler signalHandler, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
+    protected boolean skipNextLf;
+
+    @SuppressWarnings("this-escape")
+    public AbstractWindowsTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            Writer writer,
+            String name,
+            String type,
+            Charset encoding,
+            boolean nativeSignals,
+            SignalHandler signalHandler,
+            Console inConsole,
+            int inConsoleMode,
+            Console outConsole,
+            int outConsoleMode,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         super(name, type, encoding, signalHandler);
+        this.provider = provider;
+        this.systemStream = systemStream;
         NonBlockingPumpReader reader = NonBlocking.nonBlockingPumpReader();
         this.slaveInputPipe = reader.getWriter();
         this.input = inputStreamWrapper.apply(NonBlocking.nonBlockingStream(reader, encoding()));
         this.reader = NonBlocking.nonBlocking(name, input, encoding());
         this.writer = new PrintWriter(writer);
         this.output = new WriterOutputStream(writer, encoding());
+        this.inConsole = inConsole;
+        this.outConsole = outConsole;
         parseInfoCmp();
         // Attributes
-        originalConsoleMode = getConsoleMode();
+        this.originalInConsoleMode = inConsoleMode;
+        this.originalOutConsoleMode = outConsoleMode;
         attributes.setLocalFlag(Attributes.LocalFlag.ISIG, true);
         attributes.setControlChar(Attributes.ControlChar.VINTR, ctrl('C'));
-        attributes.setControlChar(Attributes.ControlChar.VEOF,  ctrl('D'));
+        attributes.setControlChar(Attributes.ControlChar.VEOF, ctrl('D'));
         attributes.setControlChar(Attributes.ControlChar.VSUSP, ctrl('Z'));
         // Handle signals
         if (nativeSignals) {
@@ -148,7 +176,7 @@ public OutputStream output() {
     }
 
     public Attributes getAttributes() {
-        int mode = getConsoleMode();
+        int mode = getConsoleMode(inConsole);
         if ((mode & ENABLE_ECHO_INPUT) != 0) {
             attributes.setLocalFlag(Attributes.LocalFlag.ECHO, true);
         }
@@ -173,8 +201,11 @@ protected void updateConsoleMode() {
         }
         if (tracking != MouseTracking.Off) {
             mode |= ENABLE_MOUSE_INPUT;
+            // mouse events not send with quick edit mode
+            // to disable ENABLE_QUICK_EDIT_MODE just set extended flag
+            mode |= ENABLE_EXTENDED_FLAGS;
         }
-        setConsoleMode(mode);
+        setConsoleMode(inConsole, mode);
     }
 
     protected int ctrl(char key) {
@@ -197,23 +228,26 @@ protected void doClose() throws IOException {
         }
         reader.close();
         writer.close();
-        setConsoleMode(originalConsoleMode);
+        setConsoleMode(inConsole, originalInConsoleMode);
+        setConsoleMode(outConsole, originalOutConsoleMode);
     }
 
     static final int SHIFT_FLAG = 0x01;
-    static final int ALT_FLAG =   0x02;
-    static final int CTRL_FLAG =  0x04;
-
-    static final int RIGHT_ALT_PRESSED =   0x0001;
-    static final int LEFT_ALT_PRESSED =    0x0002;
-    static final int RIGHT_CTRL_PRESSED =  0x0004;
-    static final int LEFT_CTRL_PRESSED =   0x0008;
-    static final int SHIFT_PRESSED =       0x0010;
-    static final int NUMLOCK_ON =          0x0020;
-    static final int SCROLLLOCK_ON =       0x0040;
-    static final int CAPSLOCK_ON =         0x0080;
-
-    protected void processKeyEvent(final boolean isKeyDown, final short virtualKeyCode, char ch, final int controlKeyState) throws IOException {
+    static final int ALT_FLAG = 0x02;
+    static final int CTRL_FLAG = 0x04;
+
+    static final int RIGHT_ALT_PRESSED = 0x0001;
+    static final int LEFT_ALT_PRESSED = 0x0002;
+    static final int RIGHT_CTRL_PRESSED = 0x0004;
+    static final int LEFT_CTRL_PRESSED = 0x0008;
+    static final int SHIFT_PRESSED = 0x0010;
+    static final int NUMLOCK_ON = 0x0020;
+    static final int SCROLLLOCK_ON = 0x0040;
+    static final int CAPSLOCK_ON = 0x0080;
+
+    protected void processKeyEvent(
+            final boolean isKeyDown, final short virtualKeyCode, char ch, final int controlKeyState)
+            throws IOException {
         final boolean isCtrl = (controlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) > 0;
         final boolean isAlt = (controlKeyState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) > 0;
         final boolean isShift = (controlKeyState & SHIFT_PRESSED) > 0;
@@ -222,11 +256,13 @@ protected void processKeyEvent(final boolean isKeyDown, final short virtualKeyCo
             // Pressing "Alt Gr" is translated to Alt-Ctrl, hence it has to be checked that Ctrl is _not_ pressed,
             // otherwise inserting of "Alt Gr" codes on non-US keyboards would yield errors
             if (ch != 0
-                    && (controlKeyState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED | RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED | SHIFT_PRESSED))
-                        == (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) {
+                    && (controlKeyState
+                                    & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED | RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED))
+                            == (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) {
                 processInputChar(ch);
             } else {
-                final String keySeq = getEscapeSequence(virtualKeyCode, (isCtrl ? CTRL_FLAG : 0) + (isAlt ? ALT_FLAG : 0) + (isShift ? SHIFT_FLAG : 0));
+                final String keySeq = getEscapeSequence(
+                        virtualKeyCode, (isCtrl ? CTRL_FLAG : 0) + (isAlt ? ALT_FLAG : 0) + (isShift ? SHIFT_FLAG : 0));
                 if (keySeq != null) {
                     for (char c : keySeq.toCharArray()) {
                         processInputChar(c);
@@ -240,7 +276,7 @@ protected void processKeyEvent(final boolean isKeyDown, final short virtualKeyCo
                  * 4). Ctrl + Space(0x20)          : uchar=0x20
                  * 5). Ctrl + <Other key>          : uchar=0
                  * 6). Ctrl + Alt + <Any key>      : uchar=0
-                */
+                 */
                 if (ch > 0) {
                     if (isAlt) {
                         processInputChar('\033');
@@ -254,10 +290,10 @@ protected void processKeyEvent(final boolean isKeyDown, final short virtualKeyCo
                     } else {
                         processInputChar(ch);
                     }
-                } else if (isCtrl) { //Handles the ctrl key events(uchar=0)
+                } else if (isCtrl) { // Handles the ctrl key events(uchar=0)
                     if (virtualKeyCode >= 'A' && virtualKeyCode <= 'Z') {
                         ch = (char) (virtualKeyCode - 0x40);
-                    } else if (virtualKeyCode == 191) { //?
+                    } else if (virtualKeyCode == 191) { // ?
                         ch = 127;
                     }
                     if (ch > 0) {
@@ -275,7 +311,7 @@ protected void processKeyEvent(final boolean isKeyDown, final short virtualKeyCo
         else {
             // support ALT+NumPad input method
             if (virtualKeyCode == 0x12 /*VK_MENU ALT key*/ && ch > 0) {
-                processInputChar(ch);  // no such combination in Windows
+                processInputChar(ch); // no such combination in Windows
             }
         }
     }
@@ -468,7 +504,19 @@ public void processInputChar(char c) throws IOException {
                 raise(Signal.INFO);
             }
         }
-        if (c == '\r') {
+        if (attributes.getInputFlag(Attributes.InputFlag.INORMEOL)) {
+            if (c == '\r') {
+                skipNextLf = true;
+                c = '\n';
+            } else if (c == '\n') {
+                if (skipNextLf) {
+                    skipNextLf = false;
+                    return;
+                }
+            } else {
+                skipNextLf = false;
+            }
+        } else if (c == '\r') {
             if (attributes.getInputFlag(Attributes.InputFlag.IGNCR)) {
                 return;
             }
@@ -478,10 +526,10 @@ public void processInputChar(char c) throws IOException {
         } else if (c == '\n' && attributes.getInputFlag(Attributes.InputFlag.INLCR)) {
             c = '\r';
         }
-//        if (attributes.getLocalFlag(Attributes.LocalFlag.ECHO)) {
-//            processOutputByte(c);
-//            masterOutput.flush();
-//        }
+        //        if (attributes.getLocalFlag(Attributes.LocalFlag.ECHO)) {
+        //            processOutputByte(c);
+        //            masterOutput.flush();
+        //        }
         slaveInputPipe.write(c);
     }
 
@@ -492,9 +540,9 @@ public boolean trackMouse(MouseTracking tracking) {
         return true;
     }
 
-    protected abstract int getConsoleMode();
+    protected abstract int getConsoleMode(Console console);
 
-    protected abstract void setConsoleMode(int mode);
+    protected abstract void setConsoleMode(Console console, int mode);
 
     /**
      * Read a single input event from the input buffer and process it.
@@ -504,5 +552,13 @@ public boolean trackMouse(MouseTracking tracking) {
      */
     protected abstract boolean processConsoleInput() throws IOException;
 
-}
+    @Override
+    public TerminalProvider getProvider() {
+        return provider;
+    }
 
+    @Override
+    public SystemStream getSystemStream() {
+        return systemStream;
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/CursorSupport.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/CursorSupport.java
index ef22cd0a7d877..14253d8c1d19a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/CursorSupport.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/CursorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,17 +8,17 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
-import jdk.internal.org.jline.terminal.Cursor;
-import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.utils.Curses;
-import jdk.internal.org.jline.utils.InfoCmp;
-
 import java.io.IOError;
 import java.io.IOException;
 import java.util.function.IntConsumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jdk.internal.org.jline.terminal.Cursor;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.utils.Curses;
+import jdk.internal.org.jline.utils.InfoCmp;
+
 public class CursorSupport {
 
     public static Cursor getCursorPosition(Terminal terminal, IntConsumer discarded) {
@@ -105,5 +105,4 @@ public static Cursor getCursorPosition(Terminal terminal, IntConsumer discarded)
             throw new IOError(e);
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
index dfa784c29f30c..dc54ea2157d8d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, the original author or authors.
+ * Copyright (c) 2022, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -17,6 +17,7 @@
 
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.OSUtils;
 
@@ -26,7 +27,7 @@ public static void main(String[] args) {
         diag(System.out);
     }
 
-    static void diag(PrintStream out) {
+    public static void diag(PrintStream out) {
         out.println("System properties");
         out.println("=================");
         out.println("os.name =         " + System.getProperty("os.name"));
@@ -50,6 +51,17 @@ static void diag(PrintStream out) {
         out.println("IS_OSX =     " + OSUtils.IS_OSX);
         out.println();
 
+        // FFM
+        out.println("FFM Support");
+        out.println("=================");
+        try {
+            TerminalProvider provider = TerminalProvider.load("ffm");
+            testProvider(out, provider);
+        } catch (Throwable t) {
+            out.println("FFM support not available: " + t);
+        }
+        out.println();
+
         out.println("JnaSupport");
         out.println("=================");
         try {
@@ -60,13 +72,23 @@ static void diag(PrintStream out) {
         }
         out.println();
 
-        out.println("JansiSupport");
+        out.println("Jansi2Support");
         out.println("=================");
         try {
             TerminalProvider provider = TerminalProvider.load("jansi");
             testProvider(out, provider);
         } catch (Throwable t) {
-            out.println("Jansi support not available: " + t);
+            out.println("Jansi 2 support not available: " + t);
+        }
+        out.println();
+
+        out.println("JniSupport");
+        out.println("=================");
+        try {
+            TerminalProvider provider = TerminalProvider.load("jni");
+            testProvider(out, provider);
+        } catch (Throwable t) {
+            out.println("JNI support not available: " + t);
         }
         out.println();
 
@@ -83,32 +105,45 @@ static void diag(PrintStream out) {
 
     private static void testProvider(PrintStream out, TerminalProvider provider) {
         try {
-            out.println("StdIn stream =    " + provider.isSystemStream(TerminalProvider.Stream.Input));
-            out.println("StdOut stream =   " + provider.isSystemStream(TerminalProvider.Stream.Output));
-            out.println("StdErr stream =   " + provider.isSystemStream(TerminalProvider.Stream.Error));
+            out.println("StdIn stream =    " + provider.isSystemStream(SystemStream.Input));
+            out.println("StdOut stream =   " + provider.isSystemStream(SystemStream.Output));
+            out.println("StdErr stream =   " + provider.isSystemStream(SystemStream.Error));
         } catch (Throwable t2) {
             out.println("Unable to check stream: " + t2);
         }
         try {
-            out.println("StdIn stream name =     " + provider.systemStreamName(TerminalProvider.Stream.Input));
-            out.println("StdOut stream name =    " + provider.systemStreamName(TerminalProvider.Stream.Output));
-            out.println("StdErr stream name =    " + provider.systemStreamName(TerminalProvider.Stream.Error));
+            out.println("StdIn stream name =     " + provider.systemStreamName(SystemStream.Input));
+            out.println("StdOut stream name =    " + provider.systemStreamName(SystemStream.Output));
+            out.println("StdErr stream name =    " + provider.systemStreamName(SystemStream.Error));
         } catch (Throwable t2) {
             out.println("Unable to check stream names: " + t2);
         }
-        try (Terminal terminal = provider.sysTerminal("diag", "xterm", false, StandardCharsets.UTF_8,
-                false, Terminal.SignalHandler.SIG_DFL, false, TerminalProvider.Stream.Output, input -> input) ) {
+        try (Terminal terminal = provider.sysTerminal(
+                "diag",
+                "xterm",
+                false,
+                StandardCharsets.UTF_8,
+                false,
+                Terminal.SignalHandler.SIG_DFL,
+                false,
+                SystemStream.Output,
+                input -> input)) {
             if (terminal != null) {
                 Attributes attr = terminal.enterRawMode();
                 try {
                     out.println("Terminal size: " + terminal.getSize());
-                    ForkJoinTask<Integer> t = new ForkJoinPool(1).submit(() -> terminal.reader().read(1) );
+                    ForkJoinTask<Integer> t =
+                            new ForkJoinPool(1).submit(() -> terminal.reader().read(1));
                     int r = t.get(1000, TimeUnit.MILLISECONDS);
                     StringBuilder sb = new StringBuilder();
                     sb.append("The terminal seems to work: ");
                     sb.append("terminal ").append(terminal.getClass().getName());
                     if (terminal instanceof AbstractPosixTerminal) {
-                        sb.append(" with pty ").append(((AbstractPosixTerminal) terminal).getPty().getClass().getName());
+                        sb.append(" with pty ")
+                                .append(((AbstractPosixTerminal) terminal)
+                                        .getPty()
+                                        .getClass()
+                                        .getName());
                     }
                     out.println(sb);
                 } catch (Throwable t3) {
@@ -129,5 +164,4 @@ private static void testProvider(PrintStream out, TerminalProvider provider) {
     static <S> S load(Class<S> clazz) {
         return ServiceLoader.load(clazz, clazz.getClassLoader()).iterator().next();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminal.java
index 0b8cb57cbbf24..2922132c1bfad 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,38 +14,58 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
+import java.util.function.Function;
 
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Attributes.ControlChar;
 import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.utils.NonBlockingInputStream;
 import jdk.internal.org.jline.utils.NonBlockingReader;
 
 public class DumbTerminal extends AbstractTerminal {
 
+    private final TerminalProvider provider;
+    private final SystemStream systemStream;
     private final NonBlockingInputStream input;
     private final OutputStream output;
     private final NonBlockingReader reader;
     private final PrintWriter writer;
     private final Attributes attributes;
     private final Size size;
+    private boolean skipNextLf;
 
-    public DumbTerminal(InputStream in, OutputStream out) throws IOException {
-        this(TYPE_DUMB, TYPE_DUMB, in, out, null);
+    public DumbTerminal(InputStream in, OutputStream out, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
+        this(TYPE_DUMB, TYPE_DUMB, in, out, null, inputStreamWrapper);
     }
 
-    public DumbTerminal(String name, String type, InputStream in, OutputStream out, Charset encoding) throws IOException {
-        this(name, type, in, out, encoding, SignalHandler.SIG_DFL);
+    public DumbTerminal(String name, String type, InputStream in, OutputStream out, Charset encoding, Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        this(null, null, name, type, in, out, encoding, SignalHandler.SIG_DFL, inputStreamWrapper);
     }
 
-    public DumbTerminal(String name, String type, InputStream in, OutputStream out, Charset encoding, SignalHandler signalHandler) throws IOException {
+    @SuppressWarnings("this-escape")
+    public DumbTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            String name,
+            String type,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            SignalHandler signalHandler,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         super(name, type, encoding, signalHandler);
-        NonBlockingInputStream nbis = NonBlocking.nonBlocking(getName(), in);
+        this.provider = provider;
+        this.systemStream = systemStream;
+        NonBlockingInputStream nbis = NonBlocking.nonBlocking(getName(), inputStreamWrapper.apply(in));
         this.input = new NonBlockingInputStream() {
             @Override
             public int read(long timeout, boolean isPeek) throws IOException {
-                for (;;) {
+                for (; ; ) {
                     int c = nbis.read(timeout, isPeek);
                     if (attributes.getLocalFlag(Attributes.LocalFlag.ISIG)) {
                         if (c == attributes.getControlChar(ControlChar.VINTR)) {
@@ -62,7 +82,19 @@ public int read(long timeout, boolean isPeek) throws IOException {
                             continue;
                         }
                     }
-                    if (c == '\r') {
+                    if (attributes.getInputFlag(Attributes.InputFlag.INORMEOL)) {
+                        if (c == '\r') {
+                            skipNextLf = true;
+                            c = '\n';
+                        } else if (c == '\n') {
+                            if (skipNextLf) {
+                                skipNextLf = false;
+                                continue;
+                            }
+                        } else {
+                            skipNextLf = false;
+                        }
+                    } else if (c == '\r') {
                         if (attributes.getInputFlag(Attributes.InputFlag.IGNCR)) {
                             continue;
                         }
@@ -80,10 +112,10 @@ public int read(long timeout, boolean isPeek) throws IOException {
         this.reader = NonBlocking.nonBlocking(getName(), input, encoding());
         this.writer = new PrintWriter(new OutputStreamWriter(output, encoding()));
         this.attributes = new Attributes();
-        this.attributes.setControlChar(ControlChar.VERASE,  (char) 127);
+        this.attributes.setControlChar(ControlChar.VERASE, (char) 127);
         this.attributes.setControlChar(ControlChar.VWERASE, (char) 23);
-        this.attributes.setControlChar(ControlChar.VKILL,   (char) 21);
-        this.attributes.setControlChar(ControlChar.VLNEXT,  (char) 22);
+        this.attributes.setControlChar(ControlChar.VKILL, (char) 21);
+        this.attributes.setControlChar(ControlChar.VLNEXT, (char) 22);
         this.size = new Size();
         parseInfoCmp();
     }
@@ -107,9 +139,7 @@ public OutputStream output() {
     }
 
     public Attributes getAttributes() {
-        Attributes attr = new Attributes();
-        attr.copy(attributes);
-        return attr;
+        return new Attributes(attributes);
     }
 
     public void setAttributes(Attributes attr) {
@@ -126,4 +156,13 @@ public void setSize(Size sz) {
         size.copy(sz);
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return provider;
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return systemStream;
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminalProvider.java
new file mode 100644
index 0000000000000..8ff9735306598
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminalProvider.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl;
+
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.util.function.Function;
+
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.TerminalBuilder;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+
+public class DumbTerminalProvider implements TerminalProvider {
+
+    @Override
+    public String name() {
+        return TerminalBuilder.PROP_PROVIDER_DUMB;
+    }
+
+    @Override
+    public Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        return new DumbTerminal(
+                this,
+                systemStream,
+                name,
+                type,
+                new FileInputStream(FileDescriptor.in),
+                new FileOutputStream(systemStream == SystemStream.Error ? FileDescriptor.err : FileDescriptor.out),
+                encoding,
+                signalHandler,
+                inputStreamWrapper);
+    }
+
+    @Override
+    public Terminal newTerminal(
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isSystemStream(SystemStream stream) {
+        return false;
+    }
+
+    @Override
+    public String systemStreamName(SystemStream stream) {
+        return null;
+    }
+
+    @Override
+    public int systemStreamWidth(SystemStream stream) {
+        return 0;
+    }
+
+    @Override
+    public String toString() {
+        return "TerminalProvider[" + name() + "]";
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExternalTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExternalTerminal.java
index 2814b52c7ccd3..5033fd61279f2 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExternalTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExternalTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,10 +8,6 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Cursor;
-import jdk.internal.org.jline.terminal.Size;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -19,6 +15,11 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.IntConsumer;
 
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Cursor;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+
 /**
  * Console implementation with embedded line disciplined.
  *
@@ -32,45 +33,59 @@
  */
 public class ExternalTerminal extends LineDisciplineTerminal {
 
+    private final TerminalProvider provider;
     protected final AtomicBoolean closed = new AtomicBoolean();
     protected final InputStream masterInput;
     protected final Object lock = new Object();
     protected boolean paused = true;
     protected Thread pumpThread;
 
-    public ExternalTerminal(String name, String type,
-                            InputStream masterInput,
-                            OutputStream masterOutput,
-                            Charset encoding) throws IOException {
-        this(name, type, masterInput, masterOutput, encoding, SignalHandler.SIG_DFL);
+    public ExternalTerminal(
+            String name, String type, InputStream masterInput, OutputStream masterOutput, Charset encoding)
+            throws IOException {
+        this(null, name, type, masterInput, masterOutput, encoding, SignalHandler.SIG_DFL);
     }
 
-    public ExternalTerminal(String name, String type,
-                            InputStream masterInput,
-                            OutputStream masterOutput,
-                            Charset encoding,
-                            SignalHandler signalHandler) throws IOException {
-        this(name, type, masterInput, masterOutput, encoding, signalHandler, false);
+    public ExternalTerminal(
+            TerminalProvider provider,
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            SignalHandler signalHandler)
+            throws IOException {
+        this(provider, name, type, masterInput, masterOutput, encoding, signalHandler, false);
     }
 
-    public ExternalTerminal(String name, String type,
-                            InputStream masterInput,
-                            OutputStream masterOutput,
-                            Charset encoding,
-                            SignalHandler signalHandler,
-                            boolean paused) throws IOException {
-        this(name, type, masterInput, masterOutput, encoding, signalHandler, paused, null, null);
+    public ExternalTerminal(
+            TerminalProvider provider,
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            SignalHandler signalHandler,
+            boolean paused)
+            throws IOException {
+        this(provider, name, type, masterInput, masterOutput, encoding, signalHandler, paused, null, null);
     }
 
-    public ExternalTerminal(String name, String type,
-                            InputStream masterInput,
-                            OutputStream masterOutput,
-                            Charset encoding,
-                            SignalHandler signalHandler,
-                            boolean paused,
-                            Attributes attributes,
-                            Size size) throws IOException {
+    @SuppressWarnings("this-escape")
+    public ExternalTerminal(
+            TerminalProvider provider,
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
         super(name, type, masterOutput, encoding, signalHandler);
+        this.provider = provider;
         this.masterInput = masterInput;
         if (attributes != null) {
             setAttributes(attributes);
@@ -171,4 +186,8 @@ public Cursor getCursorPosition(IntConsumer discarded) {
         return CursorSupport.getCursorPosition(this, discarded);
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return provider;
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/LineDisciplineTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/LineDisciplineTerminal.java
index 0f290379bbf50..4e7a396bbc304 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/LineDisciplineTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/LineDisciplineTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,6 +14,7 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
+import java.util.EnumSet;
 import java.util.Objects;
 
 import jdk.internal.org.jline.terminal.Attributes;
@@ -23,6 +24,8 @@
 import jdk.internal.org.jline.terminal.Attributes.OutputFlag;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.utils.NonBlockingPumpInputStream;
 import jdk.internal.org.jline.utils.NonBlockingReader;
@@ -45,21 +48,6 @@
  */
 public class LineDisciplineTerminal extends AbstractTerminal {
 
-    private static final String DEFAULT_TERMINAL_ATTRIBUTES =
-                    "speed 9600 baud; 24 rows; 80 columns;\n" +
-                    "lflags: icanon isig iexten echo echoe -echok echoke -echonl echoctl\n" +
-                    "\t-echoprt -altwerase -noflsh -tostop -flusho pendin -nokerninfo\n" +
-                    "\t-extproc\n" +
-                    "iflags: -istrip icrnl -inlcr -igncr ixon -ixoff ixany imaxbel iutf8\n" +
-                    "\t-ignbrk brkint -inpck -ignpar -parmrk\n" +
-                    "oflags: opost onlcr -oxtabs -onocr -onlret\n" +
-                    "cflags: cread cs8 -parenb -parodd hupcl -clocal -cstopb -crtscts -dsrflow\n" +
-                    "\t-dtrflow -mdmbuf\n" +
-                    "cchars: discard = ^O; dsusp = ^Y; eof = ^D; eol = <undef>;\n" +
-                    "\teol2 = <undef>; erase = ^?; intr = ^C; kill = ^U; lnext = ^V;\n" +
-                    "\tmin = 1; quit = ^\\; reprint = ^R; start = ^Q; status = ^T;\n" +
-                    "\tstop = ^S; susp = ^Z; time = 0; werase = ^W;\n";
-
     private static final int PIPE_SIZE = 1024;
 
     /*
@@ -84,20 +72,20 @@ public class LineDisciplineTerminal extends AbstractTerminal {
      * Console data
      */
     protected final Attributes attributes;
+
     protected final Size size;
 
-    public LineDisciplineTerminal(String name,
-                                  String type,
-                                  OutputStream masterOutput,
-                                  Charset encoding) throws IOException {
+    protected boolean skipNextLf;
+
+    public LineDisciplineTerminal(String name, String type, OutputStream masterOutput, Charset encoding)
+            throws IOException {
         this(name, type, masterOutput, encoding, SignalHandler.SIG_DFL);
     }
 
-    public LineDisciplineTerminal(String name,
-                                  String type,
-                                  OutputStream masterOutput,
-                                  Charset encoding,
-                                  SignalHandler signalHandler) throws IOException {
+    @SuppressWarnings("this-escape")
+    public LineDisciplineTerminal(
+            String name, String type, OutputStream masterOutput, Charset encoding, SignalHandler signalHandler)
+            throws IOException {
         super(name, type, encoding, signalHandler);
         NonBlockingPumpInputStream input = NonBlocking.nonBlockingPumpInputStream(PIPE_SIZE);
         this.slaveInputPipe = input.getOutputStream();
@@ -106,11 +94,66 @@ public LineDisciplineTerminal(String name,
         this.slaveOutput = new FilteringOutputStream();
         this.slaveWriter = new PrintWriter(new OutputStreamWriter(slaveOutput, encoding()));
         this.masterOutput = masterOutput;
-        this.attributes = ExecPty.doGetAttr(DEFAULT_TERMINAL_ATTRIBUTES);
+        this.attributes = getDefaultTerminalAttributes();
         this.size = new Size(160, 50);
         parseInfoCmp();
     }
 
+    private static Attributes getDefaultTerminalAttributes() {
+        // speed 9600 baud; 24 rows; 80 columns;
+        // lflags: icanon isig iexten echo echoe -echok echoke -echonl echoctl
+        //     -echoprt -altwerase -noflsh -tostop -flusho pendin -nokerninfo
+        //     -extproc
+        // iflags: -istrip icrnl -inlcr -igncr ixon -ixoff ixany imaxbel iutf8
+        //     -ignbrk brkint -inpck -ignpar -parmrk
+        // oflags: opost onlcr -oxtabs -onocr -onlret
+        // cflags: cread cs8 -parenb -parodd hupcl -clocal -cstopb -crtscts -dsrflow
+        //     -dtrflow -mdmbuf
+        // cchars: discard = ^O; dsusp = ^Y; eof = ^D; eol = <undef>;
+        //     eol2 = <undef>; erase = ^?; intr = ^C; kill = ^U; lnext = ^V;
+        //     min = 1; quit = ^\\; reprint = ^R; start = ^Q; status = ^T;
+        //     stop = ^S; susp = ^Z; time = 0; werase = ^W;
+        Attributes attr = new Attributes();
+        attr.setLocalFlags(EnumSet.of(
+                LocalFlag.ICANON,
+                LocalFlag.ISIG,
+                LocalFlag.IEXTEN,
+                LocalFlag.ECHO,
+                LocalFlag.ECHOE,
+                LocalFlag.ECHOKE,
+                LocalFlag.ECHOCTL,
+                LocalFlag.PENDIN));
+        attr.setInputFlags(EnumSet.of(
+                InputFlag.ICRNL,
+                InputFlag.IXON,
+                InputFlag.IXANY,
+                InputFlag.IMAXBEL,
+                InputFlag.IUTF8,
+                InputFlag.BRKINT));
+        attr.setOutputFlags(EnumSet.of(OutputFlag.OPOST, OutputFlag.ONLCR));
+        attr.setControlChar(ControlChar.VDISCARD, ctrl('O'));
+        attr.setControlChar(ControlChar.VDSUSP, ctrl('Y'));
+        attr.setControlChar(ControlChar.VEOF, ctrl('D'));
+        attr.setControlChar(ControlChar.VERASE, ctrl('?'));
+        attr.setControlChar(ControlChar.VINTR, ctrl('C'));
+        attr.setControlChar(ControlChar.VKILL, ctrl('U'));
+        attr.setControlChar(ControlChar.VLNEXT, ctrl('V'));
+        attr.setControlChar(ControlChar.VMIN, 1);
+        attr.setControlChar(ControlChar.VQUIT, ctrl('\\'));
+        attr.setControlChar(ControlChar.VREPRINT, ctrl('R'));
+        attr.setControlChar(ControlChar.VSTART, ctrl('Q'));
+        attr.setControlChar(ControlChar.VSTATUS, ctrl('T'));
+        attr.setControlChar(ControlChar.VSTOP, ctrl('S'));
+        attr.setControlChar(ControlChar.VSUSP, ctrl('Z'));
+        attr.setControlChar(ControlChar.VTIME, 0);
+        attr.setControlChar(ControlChar.VWERASE, ctrl('W'));
+        return attr;
+    }
+
+    private static int ctrl(char c) {
+        return c == '?' ? 177 : c - 64;
+    }
+
     public NonBlockingReader reader() {
         return slaveReader;
     }
@@ -130,9 +173,7 @@ public OutputStream output() {
     }
 
     public Attributes getAttributes() {
-        Attributes attr = new Attributes();
-        attr.copy(attributes);
-        return attr;
+        return new Attributes(attributes);
     }
 
     public void setAttributes(Attributes attr) {
@@ -149,9 +190,9 @@ public void setSize(Size sz) {
         size.copy(sz);
     }
 
-   @Override
+    @Override
     public void raise(Signal signal) {
-       Objects.requireNonNull(signal);
+        Objects.requireNonNull(signal);
         // Do not call clear() atm as this can cause
         // deadlock between reading / writing threads
         // TODO: any way to fix that ?
@@ -214,7 +255,19 @@ protected boolean doProcessInputByte(int c) throws IOException {
                 raise(Signal.INFO);
             }
         }
-        if (c == '\r') {
+        if (attributes.getInputFlag(InputFlag.INORMEOL)) {
+            if (c == '\r') {
+                skipNextLf = true;
+                c = '\n';
+            } else if (c == '\n') {
+                if (skipNextLf) {
+                    skipNextLf = false;
+                    return false;
+                }
+            } else {
+                skipNextLf = false;
+            }
+        } else if (c == '\r') {
             if (attributes.getInputFlag(InputFlag.IGNCR)) {
                 return false;
             }
@@ -273,6 +326,16 @@ protected void doClose() throws IOException {
         }
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return null;
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return null;
+    }
+
     private class FilteringOutputStream extends OutputStream {
         @Override
         public void write(int b) throws IOException {
@@ -284,13 +347,12 @@ public void write(int b) throws IOException {
         public void write(byte[] b, int off, int len) throws IOException {
             if (b == null) {
                 throw new NullPointerException();
-            } else if ((off < 0) || (off > b.length) || (len < 0) ||
-                    ((off + len) > b.length) || ((off + len) < 0)) {
+            } else if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0)) {
                 throw new IndexOutOfBoundsException();
             } else if (len == 0) {
                 return;
             }
-            for (int i = 0 ; i < len ; i++) {
+            for (int i = 0; i < len; i++) {
                 processOutputByte(b[off + i]);
             }
             flush();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/MouseSupport.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/MouseSupport.java
index 89ae6e5b74a57..eef25c90d8f1c 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/MouseSupport.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/MouseSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,11 +8,6 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
-import jdk.internal.org.jline.terminal.MouseEvent;
-import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.utils.InfoCmp;
-import jdk.internal.org.jline.utils.InputStreamReader;
-
 import java.io.EOFException;
 import java.io.IOError;
 import java.io.IOException;
@@ -20,6 +15,11 @@
 import java.util.EnumSet;
 import java.util.function.IntSupplier;
 
+import jdk.internal.org.jline.terminal.MouseEvent;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.utils.InfoCmp;
+import jdk.internal.org.jline.utils.InputStreamReader;
+
 public class MouseSupport {
 
     public static boolean hasMouseSupport(Terminal terminal) {
@@ -78,7 +78,8 @@ public static MouseEvent readMouse(IntSupplier reader, MouseEvent last) {
                 case 0:
                     button = MouseEvent.Button.Button1;
                     if (last.getButton() == button
-                            && (last.getType() == MouseEvent.Type.Pressed || last.getType() == MouseEvent.Type.Dragged)) {
+                            && (last.getType() == MouseEvent.Type.Pressed
+                                    || last.getType() == MouseEvent.Type.Dragged)) {
                         type = MouseEvent.Type.Dragged;
                     } else {
                         type = MouseEvent.Type.Pressed;
@@ -87,7 +88,8 @@ public static MouseEvent readMouse(IntSupplier reader, MouseEvent last) {
                 case 1:
                     button = MouseEvent.Button.Button2;
                     if (last.getButton() == button
-                            && (last.getType() == MouseEvent.Type.Pressed || last.getType() == MouseEvent.Type.Dragged)) {
+                            && (last.getType() == MouseEvent.Type.Pressed
+                                    || last.getType() == MouseEvent.Type.Dragged)) {
                         type = MouseEvent.Type.Dragged;
                     } else {
                         type = MouseEvent.Type.Pressed;
@@ -96,7 +98,8 @@ public static MouseEvent readMouse(IntSupplier reader, MouseEvent last) {
                 case 2:
                     button = MouseEvent.Button.Button3;
                     if (last.getButton() == button
-                            && (last.getType() == MouseEvent.Type.Pressed || last.getType() == MouseEvent.Type.Dragged)) {
+                            && (last.getType() == MouseEvent.Type.Pressed
+                                    || last.getType() == MouseEvent.Type.Dragged)) {
                         type = MouseEvent.Type.Dragged;
                     } else {
                         type = MouseEvent.Type.Pressed;
@@ -134,5 +137,4 @@ private static int readExt(Terminal terminal) {
             throw new IOError(e);
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/NativeSignalHandler.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/NativeSignalHandler.java
index 00c584c6cb931..bba177794a5e0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/NativeSignalHandler.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/NativeSignalHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -17,8 +17,7 @@ public final class NativeSignalHandler implements SignalHandler {
 
     public static final NativeSignalHandler SIG_IGN = new NativeSignalHandler();
 
-    private NativeSignalHandler() {
-    }
+    private NativeSignalHandler() {}
 
     public void handle(Signal signal) {
         throw new UnsupportedOperationException();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixPtyTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixPtyTerminal.java
index f85e3fe0b0c8b..d34103e4d5e1d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixPtyTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixPtyTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -38,15 +38,34 @@ public class PosixPtyTerminal extends AbstractPosixTerminal {
     private Thread outputPumpThread;
     private boolean paused = true;
 
-    public PosixPtyTerminal(String name, String type, Pty pty, InputStream in, OutputStream out, Charset encoding) throws IOException {
+    public PosixPtyTerminal(String name, String type, Pty pty, InputStream in, OutputStream out, Charset encoding)
+            throws IOException {
         this(name, type, pty, in, out, encoding, SignalHandler.SIG_DFL);
     }
 
-    public PosixPtyTerminal(String name, String type, Pty pty, InputStream in, OutputStream out, Charset encoding, SignalHandler signalHandler) throws IOException {
+    public PosixPtyTerminal(
+            String name,
+            String type,
+            Pty pty,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            SignalHandler signalHandler)
+            throws IOException {
         this(name, type, pty, in, out, encoding, signalHandler, false);
     }
 
-    public PosixPtyTerminal(String name, String type, Pty pty, InputStream in, OutputStream out, Charset encoding, SignalHandler signalHandler, boolean paused) throws IOException {
+    @SuppressWarnings("this-escape")
+    public PosixPtyTerminal(
+            String name,
+            String type,
+            Pty pty,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            SignalHandler signalHandler,
+            boolean paused)
+            throws IOException {
         super(name, type, pty, encoding, signalHandler);
         this.in = Objects.requireNonNull(in);
         this.out = Objects.requireNonNull(out);
@@ -113,7 +132,7 @@ public void pause(boolean wait) throws InterruptedException {
         if (p1 != null) {
             p1.join();
         }
-        if (p2 !=null) {
+        if (p2 != null) {
             p2.join();
         }
     }
@@ -167,7 +186,7 @@ public void close() throws IOException {
 
     private void pumpIn() {
         try {
-            for (;;) {
+            for (; ; ) {
                 synchronized (lock) {
                     if (paused) {
                         inputPumpThread = null;
@@ -193,7 +212,7 @@ private void pumpIn() {
 
     private void pumpOut() {
         try {
-            for (;;) {
+            for (; ; ) {
                 synchronized (lock) {
                     if (paused) {
                         outputPumpThread = null;
@@ -221,5 +240,4 @@ private void pumpOut() {
             // Ignore
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixSysTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixSysTerminal.java
index a55f3d4a748c7..135ed0bb0c04b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixSysTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixSysTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,8 +18,9 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.utils.FastBufferedOutputStream;
+import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.utils.NonBlockingInputStream;
 import jdk.internal.org.jline.utils.NonBlockingReader;
 import jdk.internal.org.jline.utils.ShutdownHooks;
@@ -35,12 +36,14 @@ public class PosixSysTerminal extends AbstractPosixTerminal {
     protected final Map<Signal, Object> nativeHandlers = new HashMap<>();
     protected final Task closer;
 
-    public PosixSysTerminal(String name, String type, Pty pty, Charset encoding,
-                            boolean nativeSignals, SignalHandler signalHandler,
-                            Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
+    @SuppressWarnings("this-escape")
+    public PosixSysTerminal(
+            String name, String type, Pty pty, Charset encoding, boolean nativeSignals, SignalHandler signalHandler,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         super(name, type, pty, encoding, signalHandler);
         this.input = NonBlocking.nonBlocking(getName(), inputStreamWrapper.apply(pty.getSlaveInput()));
-        this.output = pty.getSlaveOutput();
+        this.output = new FastBufferedOutputStream(pty.getSlaveOutput());
         this.reader = NonBlocking.nonBlocking(getName(), input, encoding());
         this.writer = new PrintWriter(new OutputStreamWriter(output, encoding()));
         parseInfoCmp();
@@ -98,5 +101,4 @@ protected void doClose() throws IOException {
         // Do not call reader.close()
         reader.shutdown();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExecPty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
similarity index 71%
rename from src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExecPty.java
rename to src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
index 5377b4acdb8a2..c0a35cbd6a219 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExecPty.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
  * https://opensource.org/licenses/BSD-3-Clause
  */
-package jdk.internal.org.jline.terminal.impl;
+package jdk.internal.org.jline.terminal.impl.exec;
 
+import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FileDescriptor;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,8 +26,10 @@
 import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
 import jdk.internal.org.jline.terminal.Attributes.OutputFlag;
 import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.terminal.impl.AbstractPty;
 import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.OSUtils;
 
 import static jdk.internal.org.jline.utils.ExecHelper.exec;
@@ -35,28 +37,26 @@
 public class ExecPty extends AbstractPty implements Pty {
 
     private final String name;
-    private final TerminalProvider.Stream console;
 
-    public static Pty current(TerminalProvider.Stream console) throws IOException {
+    public static Pty current(TerminalProvider provider, SystemStream systemStream) throws IOException {
         try {
             String result = exec(true, OSUtils.TTY_COMMAND);
-            if (console != TerminalProvider.Stream.Output && console != TerminalProvider.Stream.Error) {
-                throw new IllegalArgumentException("console should be Output or Error: " + console);
+            if (systemStream != SystemStream.Output && systemStream != SystemStream.Error) {
+                throw new IllegalArgumentException("systemStream should be Output or Error: " + systemStream);
             }
-            return new ExecPty(result.trim(), console);
+            return new ExecPty(provider, systemStream, result.trim());
         } catch (IOException e) {
             throw new IOException("Not a tty", e);
         }
     }
 
-    protected ExecPty(String name, TerminalProvider.Stream console) {
+    protected ExecPty(TerminalProvider provider, SystemStream systemStream, String name) {
+        super(provider, systemStream);
         this.name = name;
-        this.console = console;
     }
 
     @Override
-    public void close() throws IOException {
-    }
+    public void close() throws IOException {}
 
     public String getName() {
         return name;
@@ -74,18 +74,16 @@ public OutputStream getMasterOutput() {
 
     @Override
     protected InputStream doGetSlaveInput() throws IOException {
-        return console != null
-                ? new FileInputStream(FileDescriptor.in)
-                : new FileInputStream(getName());
+        return systemStream != null ? new FileInputStream(FileDescriptor.in) : new FileInputStream(getName());
     }
 
     @Override
     public OutputStream getSlaveOutput() throws IOException {
-        return console == TerminalProvider.Stream.Output
+        return systemStream == SystemStream.Output
                 ? new FileOutputStream(FileDescriptor.out)
-                : console == TerminalProvider.Stream.Error
-                    ? new FileOutputStream(FileDescriptor.err)
-                    : new FileOutputStream(getName());
+                : systemStream == SystemStream.Error
+                        ? new FileOutputStream(FileDescriptor.err)
+                        : new FileOutputStream(getName());
     }
 
     @Override
@@ -99,18 +97,30 @@ protected void doSetAttr(Attributes attr) throws IOException {
         List<String> commands = getFlagsToSet(attr, getAttr());
         if (!commands.isEmpty()) {
             commands.add(0, OSUtils.STTY_COMMAND);
-            if (console == null) {
+            if (systemStream == null) {
                 commands.add(1, OSUtils.STTY_F_OPTION);
                 commands.add(2, getName());
             }
-            exec(console != null, commands.toArray(new String[0]));
+            try {
+                exec(systemStream != null, commands.toArray(new String[0]));
+            } catch (IOException e) {
+                // Handle partial failures with GNU stty, see #97
+                if (e.toString().contains("unable to perform all requested operations")) {
+                    commands = getFlagsToSet(attr, getAttr());
+                    if (!commands.isEmpty()) {
+                        throw new IOException("Could not set the following flags: " + String.join(", ", commands), e);
+                    }
+                } else {
+                    throw e;
+                }
+            }
         }
     }
 
     protected List<String> getFlagsToSet(Attributes attr, Attributes current) {
         List<String> commands = new ArrayList<>();
         for (InputFlag flag : InputFlag.values()) {
-            if (attr.getInputFlag(flag) != current.getInputFlag(flag)) {
+            if (attr.getInputFlag(flag) != current.getInputFlag(flag) && flag != InputFlag.INORMEOL) {
                 commands.add((attr.getInputFlag(flag) ? flag.name() : "-" + flag.name()).toLowerCase());
             }
         }
@@ -137,11 +147,9 @@ protected List<String> getFlagsToSet(Attributes attr, Attributes current) {
                 commands.add(cchar.name().toLowerCase().substring(1));
                 if (cchar == ControlChar.VMIN || cchar == ControlChar.VTIME) {
                     commands.add(Integer.toString(v));
-                }
-                else if (v == 0) {
+                } else if (v == 0) {
                     commands.add(undef);
-                }
-                else {
+                } else {
                     if (v >= 128) {
                         v -= 128;
                         str += "M-";
@@ -165,12 +173,12 @@ public Size getSize() throws IOException {
     }
 
     protected String doGetConfig() throws IOException {
-        return console != null
-                ? exec(true,  OSUtils.STTY_COMMAND, "-a")
+        return systemStream != null
+                ? exec(true, OSUtils.STTY_COMMAND, "-a")
                 : exec(false, OSUtils.STTY_COMMAND, OSUtils.STTY_F_OPTION, getName(), "-a");
     }
 
-    static Attributes doGetAttr(String cfg) throws IOException {
+    public static Attributes doGetAttr(String cfg) throws IOException {
         Attributes attributes = new Attributes();
         for (InputFlag flag : InputFlag.values()) {
             Boolean value = doGetFlag(cfg, flag);
@@ -201,16 +209,19 @@ static Attributes doGetAttr(String cfg) throws IOException {
             if ("reprint".endsWith(name)) {
                 name = "(?:reprint|rprnt)";
             }
-            Matcher matcher = Pattern.compile("[\\s;]" + name + "\\s*=\\s*(.+?)[\\s;]").matcher(cfg);
+            Matcher matcher =
+                    Pattern.compile("[\\s;]" + name + "\\s*=\\s*(.+?)[\\s;]").matcher(cfg);
             if (matcher.find()) {
-                attributes.setControlChar(cchar, parseControlChar(matcher.group(1).toUpperCase()));
+                attributes.setControlChar(
+                        cchar, parseControlChar(matcher.group(1).toUpperCase()));
             }
         }
         return attributes;
     }
 
     private static Boolean doGetFlag(String cfg, Enum<?> flag) {
-        Matcher matcher = Pattern.compile("(?:^|[\\s;])(\\-?" + flag.name().toLowerCase() + ")(?:[\\s;]|$)").matcher(cfg);
+        Matcher matcher = Pattern.compile("(?:^|[\\s;])(\\-?" + flag.name().toLowerCase() + ")(?:[\\s;]|$)")
+                .matcher(cfg);
         return matcher.find() ? !matcher.group(1).startsWith("-") : null;
     }
 
@@ -259,9 +270,7 @@ static Size doGetSize(String cfg) throws IOException {
 
     static int doGetInt(String name, String cfg) throws IOException {
         String[] patterns = new String[] {
-                "\\b([0-9]+)\\s+" + name + "\\b",
-                "\\b" + name + "\\s+([0-9]+)\\b",
-                "\\b" + name + "\\s*=\\s*([0-9]+)\\b"
+            "\\b([0-9]+)\\s+" + name + "\\b", "\\b" + name + "\\s+([0-9]+)\\b", "\\b" + name + "\\s*=\\s*([0-9]+)\\b"
         };
         for (String pattern : patterns) {
             Matcher matcher = Pattern.compile(pattern).matcher(cfg);
@@ -274,23 +283,29 @@ static int doGetInt(String name, String cfg) throws IOException {
 
     @Override
     public void setSize(Size size) throws IOException {
-        if (console != null) {
-            exec(true,
-                 OSUtils.STTY_COMMAND,
-                 "columns", Integer.toString(size.getColumns()),
-                 "rows", Integer.toString(size.getRows()));
+        if (systemStream != null) {
+            exec(
+                    true,
+                    OSUtils.STTY_COMMAND,
+                    "columns",
+                    Integer.toString(size.getColumns()),
+                    "rows",
+                    Integer.toString(size.getRows()));
         } else {
-            exec(false,
-                 OSUtils.STTY_COMMAND,
-                 OSUtils.STTY_F_OPTION, getName(),
-                 "columns", Integer.toString(size.getColumns()),
-                 "rows", Integer.toString(size.getRows()));
+            exec(
+                    false,
+                    OSUtils.STTY_COMMAND,
+                    OSUtils.STTY_F_OPTION,
+                    getName(),
+                    "columns",
+                    Integer.toString(size.getColumns()),
+                    "rows",
+                    Integer.toString(size.getRows()));
         }
     }
 
     @Override
     public String toString() {
-        return "ExecPty[" + getName() + (console != null ? ", system]" : "]");
+        return "ExecPty[" + getName() + (systemStream != null ? ", system]" : "]");
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
index 8bdeede2e1b3a..418d3452d4a6c 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, the original author or authors.
+ * Copyright (c) 2022, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -17,117 +17,249 @@
 import java.nio.charset.Charset;
 import java.util.function.Function;
 
+//import jdk.internal.org.jline.nativ.JLineLibrary;
+//import jdk.internal.org.jline.nativ.JLineNativeLoader;
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.terminal.impl.ExecPty;
+import jdk.internal.org.jline.terminal.TerminalBuilder;
 import jdk.internal.org.jline.terminal.impl.ExternalTerminal;
 import jdk.internal.org.jline.terminal.impl.PosixSysTerminal;
 import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.ExecHelper;
+import jdk.internal.org.jline.utils.Log;
 import jdk.internal.org.jline.utils.OSUtils;
 
-public class ExecTerminalProvider implements TerminalProvider
-{
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE_DEFAULT;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE_REFLECTION;
+
+public class ExecTerminalProvider implements TerminalProvider {
+
+    private static boolean warned;
 
     public String name() {
-        return "exec";
+        return TerminalBuilder.PROP_PROVIDER_EXEC;
     }
 
-    public Pty current(Stream consoleStream) throws IOException {
-        return ExecPty.current(consoleStream);
+    public Pty current(SystemStream systemStream) throws IOException {
+        return ExecPty.current(this, systemStream);
     }
 
     @Override
-    public Terminal sysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
+    public Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         if (OSUtils.IS_WINDOWS) {
-            return winSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream, inputStreamWrapper );
+            return winSysTerminal(
+                    name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, systemStream, inputStreamWrapper);
         } else {
-            return posixSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream, inputStreamWrapper );
+            return posixSysTerminal(
+                    name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, systemStream, inputStreamWrapper);
         }
     }
 
-    public Terminal winSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                    boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                    Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper ) throws IOException {
+    public Terminal winSysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         if (OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM) {
-            Pty pty = current(consoleStream);
+            Pty pty = current(systemStream);
             return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler, inputStreamWrapper);
         } else {
             return null;
         }
     }
 
-    public Terminal posixSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                     boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                     Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        Pty pty = current(consoleStream);
+    public Terminal posixSysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        Pty pty = current(systemStream);
         return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler, inputStreamWrapper);
     }
 
     @Override
-    public Terminal newTerminal(String name, String type, InputStream in, OutputStream out,
-                                Charset encoding, Terminal.SignalHandler signalHandler, boolean paused,
-                                Attributes attributes, Size size) throws IOException
-    {
-        return new ExternalTerminal(name, type, in, out, encoding, signalHandler, paused, attributes, size);
+    public Terminal newTerminal(
+            String name,
+            String type,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
+        return new ExternalTerminal(this, name, type, in, out, encoding, signalHandler, paused, attributes, size);
     }
 
     @Override
-    public boolean isSystemStream(Stream stream) {
+    public boolean isSystemStream(SystemStream stream) {
         try {
-            return isWindowsSystemStream(stream) || isPosixSystemStream(stream);
+            return isPosixSystemStream(stream) || isWindowsSystemStream(stream);
         } catch (Throwable t) {
             return false;
         }
     }
 
-    public boolean isWindowsSystemStream(Stream stream) {
-        return systemStreamName( stream ) != null;
+    public boolean isWindowsSystemStream(SystemStream stream) {
+        return systemStreamName(stream) != null;
     }
 
-    public boolean isPosixSystemStream(Stream stream) {
+    public boolean isPosixSystemStream(SystemStream stream) {
         try {
             Process p = new ProcessBuilder(OSUtils.TEST_COMMAND, "-t", Integer.toString(stream.ordinal()))
-                    .inheritIO().start();
+                    .inheritIO()
+                    .start();
             return p.waitFor() == 0;
         } catch (Throwable t) {
+            Log.debug("ExecTerminalProvider failed 'test -t' for " + stream, t);
             // ignore
         }
         return false;
     }
 
     @Override
-    public String systemStreamName(Stream stream) {
+    public String systemStreamName(SystemStream stream) {
         try {
-            ProcessBuilder.Redirect input = stream == Stream.Input
-                                ? ProcessBuilder.Redirect.INHERIT
-                                : getRedirect(stream == Stream.Output ? FileDescriptor.out : FileDescriptor.err);
-            Process p = new ProcessBuilder(OSUtils.TTY_COMMAND).redirectInput(input).start();
+            ProcessBuilder.Redirect input = stream == SystemStream.Input
+                    ? ProcessBuilder.Redirect.INHERIT
+                    : newDescriptor(stream == SystemStream.Output ? FileDescriptor.out : FileDescriptor.err);
+            Process p =
+                    new ProcessBuilder(OSUtils.TTY_COMMAND).redirectInput(input).start();
             String result = ExecHelper.waitAndCapture(p);
             if (p.exitValue() == 0) {
                 return result.trim();
             }
         } catch (Throwable t) {
+            if ("java.lang.reflect.InaccessibleObjectException"
+                            .equals(t.getClass().getName())
+                    && !warned) {
+                Log.warn(
+                        "The ExecTerminalProvider requires the JVM options: '--add-opens java.base/java.lang=ALL-UNNAMED'");
+                warned = true;
+            }
             // ignore
         }
         return null;
     }
 
-    private ProcessBuilder.Redirect getRedirect(FileDescriptor fd) throws ReflectiveOperationException {
-        // This is not really allowed, but this is the only way to redirect the output or error stream
-        // to the input.  This is definitely not something you'd usually want to do, but in the case of
-        // the `tty` utility, it provides a way to get
-        Class<?> rpi = Class.forName("java.lang.ProcessBuilder$RedirectPipeImpl");
-        Constructor<?> cns = rpi.getDeclaredConstructor();
-        cns.setAccessible(true);
-        ProcessBuilder.Redirect input = (ProcessBuilder.Redirect) cns.newInstance();
-        Field f = rpi.getDeclaredField("fd");
-        f.setAccessible(true);
-        f.set(input, fd);
-        return input;
+    @Override
+    public int systemStreamWidth(SystemStream stream) {
+        try (ExecPty pty = new ExecPty(this, stream, null)) {
+            return pty.getSize().getColumns();
+        } catch (Throwable t) {
+            return -1;
+        }
+    }
+
+    private static RedirectPipeCreator redirectPipeCreator;
+
+    protected static ProcessBuilder.Redirect newDescriptor(FileDescriptor fd) {
+        if (redirectPipeCreator == null) {
+            String str = System.getProperty(PROP_REDIRECT_PIPE_CREATION_MODE, PROP_REDIRECT_PIPE_CREATION_MODE_DEFAULT);
+            String[] modes = str.split(",");
+            IllegalStateException ise = new IllegalStateException("Unable to create RedirectPipe");
+            for (String mode : modes) {
+                try {
+                    switch (mode) {
+                        case PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE:
+                            redirectPipeCreator = null;//new NativeRedirectPipeCreator();
+                            break;
+                        case PROP_REDIRECT_PIPE_CREATION_MODE_REFLECTION:
+                            redirectPipeCreator = new ReflectionRedirectPipeCreator();
+                            break;
+                    }
+                } catch (Throwable t) {
+                    // ignore
+                    ise.addSuppressed(t);
+                }
+                if (redirectPipeCreator != null) {
+                    break;
+                }
+            }
+            if (redirectPipeCreator == null) {
+                throw ise;
+            }
+        }
+        return redirectPipeCreator.newRedirectPipe(fd);
+    }
+
+    interface RedirectPipeCreator {
+        ProcessBuilder.Redirect newRedirectPipe(FileDescriptor fd);
+    }
+
+    /**
+     * Reflection based file descriptor creator.
+     * This requires the following option
+     *   --add-opens java.base/java.lang=ALL-UNNAMED
+     */
+    static class ReflectionRedirectPipeCreator implements RedirectPipeCreator {
+        private final Constructor<ProcessBuilder.Redirect> constructor;
+        private final Field fdField;
+
+        @SuppressWarnings("unchecked")
+        ReflectionRedirectPipeCreator() throws Exception {
+            Class<?> rpi = Class.forName("java.lang.ProcessBuilder$RedirectPipeImpl");
+            constructor = (Constructor<ProcessBuilder.Redirect>) rpi.getDeclaredConstructor();
+            constructor.setAccessible(true);
+            fdField = rpi.getDeclaredField("fd");
+            fdField.setAccessible(true);
+        }
+
+        @Override
+        public ProcessBuilder.Redirect newRedirectPipe(FileDescriptor fd) {
+            try {
+                ProcessBuilder.Redirect input = constructor.newInstance();
+                fdField.set(input, fd);
+                return input;
+            } catch (ReflectiveOperationException e) {
+                // This should not happen as the field has been set accessible
+                throw new IllegalStateException(e);
+            }
+        }
+    }
+
+//    static class NativeRedirectPipeCreator implements RedirectPipeCreator {
+//        public NativeRedirectPipeCreator() {
+//            // Force load the library
+//            JLineNativeLoader.initialize();
+//        }
+//
+//        @Override
+//        public ProcessBuilder.Redirect newRedirectPipe(FileDescriptor fd) {
+//            return JLineLibrary.newRedirectPipe(fd);
+//        }
+//    }
+
+    @Override
+    public String toString() {
+        return "TerminalProvider[" + name() + "]";
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java
new file mode 100644
index 0000000000000..453ce290d3ce8
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java
@@ -0,0 +1,1170 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.foreign.*;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.utils.OSUtils;
+
+@SuppressWarnings("restricted")
+class CLibrary {
+
+//    private static final Logger logger = Logger.getLogger("org.jline");
+
+    // Window sizes.
+    // @see <a href="http://man7.org/linux/man-pages/man4/tty_ioctl.4.html">IOCTL_TTY(2) man-page</a>
+    static class winsize {
+        static final GroupLayout LAYOUT;
+        private static final VarHandle ws_col;
+        private static final VarHandle ws_row;
+
+        static {
+            LAYOUT = MemoryLayout.structLayout(
+                    ValueLayout.JAVA_SHORT.withName("ws_row"),
+                    ValueLayout.JAVA_SHORT.withName("ws_col"),
+                    ValueLayout.JAVA_SHORT,
+                    ValueLayout.JAVA_SHORT);
+            ws_row = FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("ws_row"));
+            ws_col = FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("ws_col"));
+        }
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        winsize() {
+            seg = java.lang.foreign.Arena.ofAuto().allocate(LAYOUT);
+        }
+
+        winsize(short ws_col, short ws_row) {
+            this();
+            ws_col(ws_col);
+            ws_row(ws_row);
+        }
+
+        java.lang.foreign.MemorySegment segment() {
+            return seg;
+        }
+
+        short ws_col() {
+            return (short) ws_col.get(seg);
+        }
+
+        void ws_col(short col) {
+            ws_col.set(seg, col);
+        }
+
+        short ws_row() {
+            return (short) ws_row.get(seg);
+        }
+
+        void ws_row(short row) {
+            ws_row.set(seg, row);
+        }
+    }
+
+    // termios structure for termios functions, describing a general terminal interface that is
+    // provided to control asynchronous communications ports
+    // @see <a href="http://man7.org/linux/man-pages/man3/termios.3.html">TERMIOS(3) man-page</a>
+    static class termios {
+        static final GroupLayout LAYOUT;
+        private static final VarHandle c_iflag;
+        private static final VarHandle c_oflag;
+        private static final VarHandle c_cflag;
+        private static final VarHandle c_lflag;
+        private static final long c_cc_offset;
+        private static final VarHandle c_ispeed;
+        private static final VarHandle c_ospeed;
+
+        static {
+            if (OSUtils.IS_OSX) {
+                LAYOUT = MemoryLayout.structLayout(
+                        ValueLayout.JAVA_LONG.withName("c_iflag"),
+                        ValueLayout.JAVA_LONG.withName("c_oflag"),
+                        ValueLayout.JAVA_LONG.withName("c_cflag"),
+                        ValueLayout.JAVA_LONG.withName("c_lflag"),
+                        MemoryLayout.sequenceLayout(32, ValueLayout.JAVA_BYTE).withName("c_cc"),
+                        ValueLayout.JAVA_LONG.withName("c_ispeed"),
+                        ValueLayout.JAVA_LONG.withName("c_ospeed"));
+            } else if (OSUtils.IS_LINUX) {
+                LAYOUT = MemoryLayout.structLayout(
+                        ValueLayout.JAVA_INT.withName("c_iflag"),
+                        ValueLayout.JAVA_INT.withName("c_oflag"),
+                        ValueLayout.JAVA_INT.withName("c_cflag"),
+                        ValueLayout.JAVA_INT.withName("c_lflag"),
+                        ValueLayout.JAVA_BYTE.withName("c_line"),
+                        MemoryLayout.sequenceLayout(32, ValueLayout.JAVA_BYTE).withName("c_cc"),
+                        MemoryLayout.paddingLayout(3),
+                        ValueLayout.JAVA_INT.withName("c_ispeed"),
+                        ValueLayout.JAVA_INT.withName("c_ospeed"));
+            } else {
+                throw new IllegalStateException("Unsupported system!");
+            }
+            c_iflag = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_iflag")));
+            c_oflag = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_oflag")));
+            c_cflag = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_cflag")));
+            c_lflag = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_lflag")));
+            c_cc_offset = LAYOUT.byteOffset(MemoryLayout.PathElement.groupElement("c_cc"));
+            c_ispeed = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_ispeed")));
+            c_ospeed = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_ospeed")));
+        }
+
+        private static VarHandle adjust2LinuxHandle(VarHandle v) {
+            if (OSUtils.IS_LINUX) {
+                MethodHandle id = MethodHandles.identity(int.class);
+                v = MethodHandles.filterValue(
+                        v,
+                        MethodHandles.explicitCastArguments(id, MethodType.methodType(int.class, long.class)),
+                        MethodHandles.explicitCastArguments(id, MethodType.methodType(long.class, int.class)));
+            }
+
+            return v;
+        }
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        termios() {
+            seg = java.lang.foreign.Arena.ofAuto().allocate(LAYOUT);
+        }
+
+        termios(Attributes t) {
+            this();
+            // Input flags
+            long c_iflag = 0;
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IGNBRK), IGNBRK, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.BRKINT), BRKINT, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IGNPAR), IGNPAR, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.PARMRK), PARMRK, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.INPCK), INPCK, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.ISTRIP), ISTRIP, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.INLCR), INLCR, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IGNCR), IGNCR, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.ICRNL), ICRNL, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IXON), IXON, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IXOFF), IXOFF, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IXANY), IXANY, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IMAXBEL), IMAXBEL, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IUTF8), IUTF8, c_iflag);
+            c_iflag(c_iflag);
+            // Output flags
+            long c_oflag = 0;
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OPOST), OPOST, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.ONLCR), ONLCR, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OXTABS), OXTABS, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.ONOEOT), ONOEOT, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OCRNL), OCRNL, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.ONOCR), ONOCR, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.ONLRET), ONLRET, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OFILL), OFILL, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.NLDLY), NLDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.TABDLY), TABDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.CRDLY), CRDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.FFDLY), FFDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.BSDLY), BSDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.VTDLY), VTDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OFDEL), OFDEL, c_oflag);
+            c_oflag(c_oflag);
+            // Control flags
+            long c_cflag = 0;
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CIGNORE), CIGNORE, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CS5), CS5, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CS6), CS6, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CS7), CS7, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CS8), CS8, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CSTOPB), CSTOPB, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CREAD), CREAD, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.PARENB), PARENB, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.PARODD), PARODD, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.HUPCL), HUPCL, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CLOCAL), CLOCAL, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CCTS_OFLOW), CCTS_OFLOW, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CRTS_IFLOW), CRTS_IFLOW, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CDTR_IFLOW), CDTR_IFLOW, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CDSR_OFLOW), CDSR_OFLOW, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CCAR_OFLOW), CCAR_OFLOW, c_cflag);
+            c_cflag(c_cflag);
+            // Local flags
+            long c_lflag = 0;
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOKE), ECHOKE, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOE), ECHOE, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOK), ECHOK, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHO), ECHO, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHONL), ECHONL, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOPRT), ECHOPRT, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOCTL), ECHOCTL, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ISIG), ISIG, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ICANON), ICANON, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ALTWERASE), ALTWERASE, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.IEXTEN), IEXTEN, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.EXTPROC), EXTPROC, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.TOSTOP), TOSTOP, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.FLUSHO), FLUSHO, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.NOKERNINFO), NOKERNINFO, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.PENDIN), PENDIN, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.NOFLSH), NOFLSH, c_lflag);
+            c_lflag(c_lflag);
+            // Control chars
+            byte[] c_cc = new byte[20];
+            c_cc[VEOF] = (byte) t.getControlChar(Attributes.ControlChar.VEOF);
+            c_cc[VEOL] = (byte) t.getControlChar(Attributes.ControlChar.VEOL);
+            c_cc[VEOL2] = (byte) t.getControlChar(Attributes.ControlChar.VEOL2);
+            c_cc[VERASE] = (byte) t.getControlChar(Attributes.ControlChar.VERASE);
+            c_cc[VWERASE] = (byte) t.getControlChar(Attributes.ControlChar.VWERASE);
+            c_cc[VKILL] = (byte) t.getControlChar(Attributes.ControlChar.VKILL);
+            c_cc[VREPRINT] = (byte) t.getControlChar(Attributes.ControlChar.VREPRINT);
+            c_cc[VINTR] = (byte) t.getControlChar(Attributes.ControlChar.VINTR);
+            c_cc[VQUIT] = (byte) t.getControlChar(Attributes.ControlChar.VQUIT);
+            c_cc[VSUSP] = (byte) t.getControlChar(Attributes.ControlChar.VSUSP);
+            if (VDSUSP != (-1)) {
+                c_cc[VDSUSP] = (byte) t.getControlChar(Attributes.ControlChar.VDSUSP);
+            }
+            c_cc[VSTART] = (byte) t.getControlChar(Attributes.ControlChar.VSTART);
+            c_cc[VSTOP] = (byte) t.getControlChar(Attributes.ControlChar.VSTOP);
+            c_cc[VLNEXT] = (byte) t.getControlChar(Attributes.ControlChar.VLNEXT);
+            c_cc[VDISCARD] = (byte) t.getControlChar(Attributes.ControlChar.VDISCARD);
+            c_cc[VMIN] = (byte) t.getControlChar(Attributes.ControlChar.VMIN);
+            c_cc[VTIME] = (byte) t.getControlChar(Attributes.ControlChar.VTIME);
+            if (VSTATUS != (-1)) {
+                c_cc[VSTATUS] = (byte) t.getControlChar(Attributes.ControlChar.VSTATUS);
+            }
+            c_cc().copyFrom(java.lang.foreign.MemorySegment.ofArray(c_cc));
+        }
+
+        java.lang.foreign.MemorySegment segment() {
+            return seg;
+        }
+
+        long c_iflag() {
+            return (long) c_iflag.get(seg);
+        }
+
+        void c_iflag(long f) {
+            c_iflag.set(seg, f);
+        }
+
+        long c_oflag() {
+            return (long) c_oflag.get(seg);
+        }
+
+        void c_oflag(long f) {
+            c_oflag.set(seg, f);
+        }
+
+        long c_cflag() {
+            return (long) c_cflag.get(seg);
+        }
+
+        void c_cflag(long f) {
+            c_cflag.set(seg, f);
+        }
+
+        long c_lflag() {
+            return (long) c_lflag.get(seg);
+        }
+
+        void c_lflag(long f) {
+            c_lflag.set(seg, f);
+        }
+
+        java.lang.foreign.MemorySegment c_cc() {
+            return seg.asSlice(c_cc_offset, 20);
+        }
+
+        long c_ispeed() {
+            return (long) c_ispeed.get(seg);
+        }
+
+        void c_ispeed(long f) {
+            c_ispeed.set(seg, f);
+        }
+
+        long c_ospeed() {
+            return (long) c_ospeed.get(seg);
+        }
+
+        void c_ospeed(long f) {
+            c_ospeed.set(seg, f);
+        }
+
+        private static long setFlag(boolean flag, long value, long org) {
+            return flag ? org | value : org;
+        }
+
+        private static <T extends Enum<T>> void addFlag(long value, EnumSet<T> flags, T flag, int v) {
+            if ((value & v) != 0) {
+                flags.add(flag);
+            }
+        }
+
+        public Attributes asAttributes() {
+            Attributes attr = new Attributes();
+            // Input flags
+            long c_iflag = c_iflag();
+            EnumSet<Attributes.InputFlag> iflag = attr.getInputFlags();
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IGNBRK, IGNBRK);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IGNBRK, IGNBRK);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.BRKINT, BRKINT);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IGNPAR, IGNPAR);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.PARMRK, PARMRK);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.INPCK, INPCK);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.ISTRIP, ISTRIP);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.INLCR, INLCR);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IGNCR, IGNCR);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.ICRNL, ICRNL);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IXON, IXON);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IXOFF, IXOFF);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IXANY, IXANY);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IMAXBEL, IMAXBEL);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IUTF8, IUTF8);
+            // Output flags
+            long c_oflag = c_oflag();
+            EnumSet<Attributes.OutputFlag> oflag = attr.getOutputFlags();
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OPOST, OPOST);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.ONLCR, ONLCR);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OXTABS, OXTABS);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.ONOEOT, ONOEOT);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OCRNL, OCRNL);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.ONOCR, ONOCR);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.ONLRET, ONLRET);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OFILL, OFILL);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.NLDLY, NLDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.TABDLY, TABDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.CRDLY, CRDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.FFDLY, FFDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.BSDLY, BSDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.VTDLY, VTDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OFDEL, OFDEL);
+            // Control flags
+            long c_cflag = c_cflag();
+            EnumSet<Attributes.ControlFlag> cflag = attr.getControlFlags();
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CIGNORE, CIGNORE);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CS5, CS5);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CS6, CS6);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CS7, CS7);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CS8, CS8);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CSTOPB, CSTOPB);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CREAD, CREAD);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.PARENB, PARENB);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.PARODD, PARODD);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.HUPCL, HUPCL);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CLOCAL, CLOCAL);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CCTS_OFLOW, CCTS_OFLOW);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CRTS_IFLOW, CRTS_IFLOW);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CDSR_OFLOW, CDSR_OFLOW);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CCAR_OFLOW, CCAR_OFLOW);
+            // Local flags
+            long c_lflag = c_lflag();
+            EnumSet<Attributes.LocalFlag> lflag = attr.getLocalFlags();
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOKE, ECHOKE);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOE, ECHOE);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOK, ECHOK);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHO, ECHO);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHONL, ECHONL);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOPRT, ECHOPRT);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOCTL, ECHOCTL);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ISIG, ISIG);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ICANON, ICANON);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ALTWERASE, ALTWERASE);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.IEXTEN, IEXTEN);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.EXTPROC, EXTPROC);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.TOSTOP, TOSTOP);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.FLUSHO, FLUSHO);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.NOKERNINFO, NOKERNINFO);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.PENDIN, PENDIN);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.NOFLSH, NOFLSH);
+            // Control chars
+            byte[] c_cc = c_cc().toArray(ValueLayout.JAVA_BYTE);
+            EnumMap<Attributes.ControlChar, Integer> cc = attr.getControlChars();
+            cc.put(Attributes.ControlChar.VEOF, (int) c_cc[VEOF]);
+            cc.put(Attributes.ControlChar.VEOL, (int) c_cc[VEOL]);
+            cc.put(Attributes.ControlChar.VEOL2, (int) c_cc[VEOL2]);
+            cc.put(Attributes.ControlChar.VERASE, (int) c_cc[VERASE]);
+            cc.put(Attributes.ControlChar.VWERASE, (int) c_cc[VWERASE]);
+            cc.put(Attributes.ControlChar.VKILL, (int) c_cc[VKILL]);
+            cc.put(Attributes.ControlChar.VREPRINT, (int) c_cc[VREPRINT]);
+            cc.put(Attributes.ControlChar.VINTR, (int) c_cc[VINTR]);
+            cc.put(Attributes.ControlChar.VQUIT, (int) c_cc[VQUIT]);
+            cc.put(Attributes.ControlChar.VSUSP, (int) c_cc[VSUSP]);
+            if (VDSUSP != (-1)) {
+                cc.put(Attributes.ControlChar.VDSUSP, (int) c_cc[VDSUSP]);
+            }
+            cc.put(Attributes.ControlChar.VSTART, (int) c_cc[VSTART]);
+            cc.put(Attributes.ControlChar.VSTOP, (int) c_cc[VSTOP]);
+            cc.put(Attributes.ControlChar.VLNEXT, (int) c_cc[VLNEXT]);
+            cc.put(Attributes.ControlChar.VDISCARD, (int) c_cc[VDISCARD]);
+            cc.put(Attributes.ControlChar.VMIN, (int) c_cc[VMIN]);
+            cc.put(Attributes.ControlChar.VTIME, (int) c_cc[VTIME]);
+            if (VSTATUS != (-1)) {
+                cc.put(Attributes.ControlChar.VSTATUS, (int) c_cc[VSTATUS]);
+            }
+            // Return
+            return attr;
+        }
+    }
+
+    static MethodHandle ioctl;
+    static MethodHandle isatty;
+    static MethodHandle openpty;
+    static MethodHandle tcsetattr;
+    static MethodHandle tcgetattr;
+    static MethodHandle ttyname_r;
+    static LinkageError openptyError;
+
+    static {
+        // methods
+        Linker linker = Linker.nativeLinker();
+        SymbolLookup lookup = SymbolLookup.loaderLookup().or(linker.defaultLookup());
+        // https://man7.org/linux/man-pages/man2/ioctl.2.html
+        ioctl = linker.downcallHandle(
+                lookup.find("ioctl").get(),
+                FunctionDescriptor.of(
+                        ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.JAVA_LONG, ValueLayout.ADDRESS),
+                Linker.Option.firstVariadicArg(2));
+        // https://www.man7.org/linux/man-pages/man3/isatty.3.html
+        isatty = linker.downcallHandle(
+                lookup.find("isatty").get(), FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.JAVA_INT));
+        // https://man7.org/linux/man-pages/man3/tcsetattr.3p.html
+        tcsetattr = linker.downcallHandle(
+                lookup.find("tcsetattr").get(),
+                FunctionDescriptor.of(
+                        ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.ADDRESS));
+        // https://man7.org/linux/man-pages/man3/tcgetattr.3p.html
+        tcgetattr = linker.downcallHandle(
+                lookup.find("tcgetattr").get(),
+                FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.ADDRESS));
+        // https://man7.org/linux/man-pages/man3/ttyname.3.html
+        ttyname_r = linker.downcallHandle(
+                lookup.find("ttyname_r").get(),
+                FunctionDescriptor.of(
+                        ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.ADDRESS, ValueLayout.JAVA_LONG));
+        // https://man7.org/linux/man-pages/man3/openpty.3.html
+        LinkageError error = null;
+        Optional<MemorySegment> openPtyAddr = lookup.find("openpty");
+        if (openPtyAddr.isPresent()) {
+            openpty = linker.downcallHandle(
+                    openPtyAddr.get(),
+                    FunctionDescriptor.of(
+                            ValueLayout.JAVA_INT,
+                            ValueLayout.ADDRESS,
+                            ValueLayout.ADDRESS,
+                            ValueLayout.ADDRESS,
+                            ValueLayout.ADDRESS,
+                            ValueLayout.ADDRESS));
+            openptyError = null;
+        } else {
+            openpty = null;
+            openptyError = error;
+        }
+    }
+
+    private static String readFully(InputStream in) throws IOException {
+        int readLen = 0;
+        ByteArrayOutputStream b = new ByteArrayOutputStream();
+        byte[] buf = new byte[32];
+        while ((readLen = in.read(buf, 0, buf.length)) >= 0) {
+            b.write(buf, 0, readLen);
+        }
+        return b.toString();
+    }
+
+    static Size getTerminalSize(int fd) {
+        try {
+            winsize ws = new winsize();
+            int res = (int) ioctl.invoke(fd, (long) TIOCGWINSZ, ws.segment());
+            return new Size(ws.ws_col(), ws.ws_row());
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call ioctl(TIOCGWINSZ)", e);
+        }
+    }
+
+    static void setTerminalSize(int fd, Size size) {
+        try {
+            winsize ws = new winsize();
+            ws.ws_row((short) size.getRows());
+            ws.ws_col((short) size.getColumns());
+            int res = (int) ioctl.invoke(fd, TIOCSWINSZ, ws.segment());
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call ioctl(TIOCSWINSZ)", e);
+        }
+    }
+
+    static Attributes getAttributes(int fd) {
+        try {
+            termios t = new termios();
+            int res = (int) tcgetattr.invoke(fd, t.segment());
+            return t.asAttributes();
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call tcgetattr()", e);
+        }
+    }
+
+    static void setAttributes(int fd, Attributes attr) {
+        try {
+            termios t = new termios(attr);
+            int res = (int) tcsetattr.invoke(fd, TCSANOW, t.segment());
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call tcsetattr()", e);
+        }
+    }
+
+    static boolean isTty(int fd) {
+        try {
+            return (int) isatty.invoke(fd) == 1;
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call isatty()", e);
+        }
+    }
+
+    static String ttyName(int fd) {
+        try {
+            java.lang.foreign.MemorySegment buf =
+                    java.lang.foreign.Arena.ofAuto().allocate(64);
+            int res = (int) ttyname_r.invoke(fd, buf, buf.byteSize());
+            byte[] data = buf.toArray(ValueLayout.JAVA_BYTE);
+            int len = 0;
+            while (data[len] != 0) {
+                len++;
+            }
+            return new String(data, 0, len);
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call ttyname_r()", e);
+        }
+    }
+
+    static Pty openpty(TerminalProvider provider, Attributes attr, Size size) {
+        if (openptyError != null) {
+            throw openptyError;
+        }
+        try {
+            java.lang.foreign.MemorySegment buf =
+                    java.lang.foreign.Arena.ofAuto().allocate(64);
+            java.lang.foreign.MemorySegment master =
+                    java.lang.foreign.Arena.ofAuto().allocate(ValueLayout.JAVA_INT);
+            java.lang.foreign.MemorySegment slave =
+                    java.lang.foreign.Arena.ofAuto().allocate(ValueLayout.JAVA_INT);
+            int res = (int) openpty.invoke(
+                    master,
+                    slave,
+                    buf,
+                    attr != null ? new termios(attr).segment() : java.lang.foreign.MemorySegment.NULL,
+                    size != null
+                            ? new winsize((short) size.getRows(), (short) size.getColumns()).segment()
+                            : java.lang.foreign.MemorySegment.NULL);
+            byte[] str = buf.toArray(ValueLayout.JAVA_BYTE);
+            int len = 0;
+            while (str[len] != 0) {
+                len++;
+            }
+            String device = new String(str, 0, len);
+            return new FfmNativePty(
+                    provider, null, master.get(ValueLayout.JAVA_INT, 0), slave.get(ValueLayout.JAVA_INT, 0), device);
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call openpty()", e);
+        }
+    }
+
+    // CONSTANTS
+
+    private static final int TIOCGWINSZ;
+    private static final int TIOCSWINSZ;
+
+    private static final int TCSANOW;
+    private static int TCSADRAIN;
+    private static int TCSAFLUSH;
+
+    private static final int VEOF;
+    private static final int VEOL;
+    private static final int VEOL2;
+    private static final int VERASE;
+    private static final int VWERASE;
+    private static final int VKILL;
+    private static final int VREPRINT;
+    private static final int VERASE2;
+    private static final int VINTR;
+    private static final int VQUIT;
+    private static final int VSUSP;
+    private static final int VDSUSP;
+    private static final int VSTART;
+    private static final int VSTOP;
+    private static final int VLNEXT;
+    private static final int VDISCARD;
+    private static final int VMIN;
+    private static final int VSWTC;
+    private static final int VTIME;
+    private static final int VSTATUS;
+
+    private static final int IGNBRK;
+    private static final int BRKINT;
+    private static final int IGNPAR;
+    private static final int PARMRK;
+    private static final int INPCK;
+    private static final int ISTRIP;
+    private static final int INLCR;
+    private static final int IGNCR;
+    private static final int ICRNL;
+    private static int IUCLC;
+    private static final int IXON;
+    private static final int IXOFF;
+    private static final int IXANY;
+    private static final int IMAXBEL;
+    private static int IUTF8;
+
+    private static final int OPOST;
+    private static int OLCUC;
+    private static final int ONLCR;
+    private static int OXTABS;
+    private static int NLDLY;
+    private static int NL0;
+    private static int NL1;
+    private static final int TABDLY;
+    private static int TAB0;
+    private static int TAB1;
+    private static int TAB2;
+    private static int TAB3;
+    private static int CRDLY;
+    private static int CR0;
+    private static int CR1;
+    private static int CR2;
+    private static int CR3;
+    private static int FFDLY;
+    private static int FF0;
+    private static int FF1;
+    private static int XTABS;
+    private static int BSDLY;
+    private static int BS0;
+    private static int BS1;
+    private static int VTDLY;
+    private static int VT0;
+    private static int VT1;
+    private static int CBAUD;
+    private static int B0;
+    private static int B50;
+    private static int B75;
+    private static int B110;
+    private static int B134;
+    private static int B150;
+    private static int B200;
+    private static int B300;
+    private static int B600;
+    private static int B1200;
+    private static int B1800;
+    private static int B2400;
+    private static int B4800;
+    private static int B9600;
+    private static int B19200;
+    private static int B38400;
+    private static int EXTA;
+    private static int EXTB;
+    private static int OFDEL;
+    private static int ONOEOT;
+    private static final int OCRNL;
+    private static int ONOCR;
+    private static final int ONLRET;
+    private static int OFILL;
+
+    private static int CIGNORE;
+    private static int CSIZE;
+    private static final int CS5;
+    private static final int CS6;
+    private static final int CS7;
+    private static final int CS8;
+    private static final int CSTOPB;
+    private static final int CREAD;
+    private static final int PARENB;
+    private static final int PARODD;
+    private static final int HUPCL;
+    private static final int CLOCAL;
+    private static int CCTS_OFLOW;
+    private static int CRTS_IFLOW;
+    private static int CDTR_IFLOW;
+    private static int CDSR_OFLOW;
+    private static int CCAR_OFLOW;
+
+    private static final int ECHOKE;
+    private static final int ECHOE;
+    private static final int ECHOK;
+    private static final int ECHO;
+    private static final int ECHONL;
+    private static final int ECHOPRT;
+    private static final int ECHOCTL;
+    private static final int ISIG;
+    private static final int ICANON;
+    private static int XCASE;
+    private static int ALTWERASE;
+    private static final int IEXTEN;
+    private static final int EXTPROC;
+    private static final int TOSTOP;
+    private static final int FLUSHO;
+    private static int NOKERNINFO;
+    private static final int PENDIN;
+    private static final int NOFLSH;
+
+    static {
+        String osName = System.getProperty("os.name");
+        if (osName.startsWith("Linux")) {
+            String arch = System.getProperty("os.arch");
+            boolean isMipsPpcOrSparc = arch.equals("mips")
+                    || arch.equals("mips64")
+                    || arch.equals("mipsel")
+                    || arch.equals("mips64el")
+                    || arch.startsWith("ppc")
+                    || arch.startsWith("sparc");
+            TIOCGWINSZ = isMipsPpcOrSparc ? 0x40087468 : 0x00005413;
+            TIOCSWINSZ = isMipsPpcOrSparc ? 0x80087467 : 0x00005414;
+
+            TCSANOW = 0x0;
+            TCSADRAIN = 0x1;
+            TCSAFLUSH = 0x2;
+
+            VINTR = 0;
+            VQUIT = 1;
+            VERASE = 2;
+            VKILL = 3;
+            VEOF = 4;
+            VTIME = 5;
+            VMIN = 6;
+            VSWTC = 7;
+            VSTART = 8;
+            VSTOP = 9;
+            VSUSP = 10;
+            VEOL = 11;
+            VREPRINT = 12;
+            VDISCARD = 13;
+            VWERASE = 14;
+            VLNEXT = 15;
+            VEOL2 = 16;
+            VERASE2 = -1;
+            VDSUSP = -1;
+            VSTATUS = -1;
+
+            IGNBRK = 0x0000001;
+            BRKINT = 0x0000002;
+            IGNPAR = 0x0000004;
+            PARMRK = 0x0000008;
+            INPCK = 0x0000010;
+            ISTRIP = 0x0000020;
+            INLCR = 0x0000040;
+            IGNCR = 0x0000080;
+            ICRNL = 0x0000100;
+            IUCLC = 0x0000200;
+            IXON = 0x0000400;
+            IXANY = 0x0000800;
+            IXOFF = 0x0001000;
+            IMAXBEL = 0x0002000;
+            IUTF8 = 0x0004000;
+
+            OPOST = 0x0000001;
+            OLCUC = 0x0000002;
+            ONLCR = 0x0000004;
+            OCRNL = 0x0000008;
+            ONOCR = 0x0000010;
+            ONLRET = 0x0000020;
+            OFILL = 0x0000040;
+            OFDEL = 0x0000080;
+            NLDLY = 0x0000100;
+            NL0 = 0x0000000;
+            NL1 = 0x0000100;
+            CRDLY = 0x0000600;
+            CR0 = 0x0000000;
+            CR1 = 0x0000200;
+            CR2 = 0x0000400;
+            CR3 = 0x0000600;
+            TABDLY = 0x0001800;
+            TAB0 = 0x0000000;
+            TAB1 = 0x0000800;
+            TAB2 = 0x0001000;
+            TAB3 = 0x0001800;
+            XTABS = 0x0001800;
+            BSDLY = 0x0002000;
+            BS0 = 0x0000000;
+            BS1 = 0x0002000;
+            VTDLY = 0x0004000;
+            VT0 = 0x0000000;
+            VT1 = 0x0004000;
+            FFDLY = 0x0008000;
+            FF0 = 0x0000000;
+            FF1 = 0x0008000;
+
+            CBAUD = 0x000100f;
+            B0 = 0x0000000;
+            B50 = 0x0000001;
+            B75 = 0x0000002;
+            B110 = 0x0000003;
+            B134 = 0x0000004;
+            B150 = 0x0000005;
+            B200 = 0x0000006;
+            B300 = 0x0000007;
+            B600 = 0x0000008;
+            B1200 = 0x0000009;
+            B1800 = 0x000000a;
+            B2400 = 0x000000b;
+            B4800 = 0x000000c;
+            B9600 = 0x000000d;
+            B19200 = 0x000000e;
+            B38400 = 0x000000f;
+            EXTA = B19200;
+            EXTB = B38400;
+            CSIZE = 0x0000030;
+            CS5 = 0x0000000;
+            CS6 = 0x0000010;
+            CS7 = 0x0000020;
+            CS8 = 0x0000030;
+            CSTOPB = 0x0000040;
+            CREAD = 0x0000080;
+            PARENB = 0x0000100;
+            PARODD = 0x0000200;
+            HUPCL = 0x0000400;
+            CLOCAL = 0x0000800;
+
+            ISIG = 0x0000001;
+            ICANON = 0x0000002;
+            XCASE = 0x0000004;
+            ECHO = 0x0000008;
+            ECHOE = 0x0000010;
+            ECHOK = 0x0000020;
+            ECHONL = 0x0000040;
+            NOFLSH = 0x0000080;
+            TOSTOP = 0x0000100;
+            ECHOCTL = 0x0000200;
+            ECHOPRT = 0x0000400;
+            ECHOKE = 0x0000800;
+            FLUSHO = 0x0001000;
+            PENDIN = 0x0002000;
+            IEXTEN = 0x0008000;
+            EXTPROC = 0x0010000;
+        } else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
+            int _TIOC = ('T' << 8);
+            TIOCGWINSZ = (_TIOC | 104);
+            TIOCSWINSZ = (_TIOC | 103);
+
+            TCSANOW = 0x0;
+            TCSADRAIN = 0x1;
+            TCSAFLUSH = 0x2;
+
+            VINTR = 0;
+            VQUIT = 1;
+            VERASE = 2;
+            VKILL = 3;
+            VEOF = 4;
+            VTIME = 5;
+            VMIN = 6;
+            VSWTC = 7;
+            VSTART = 8;
+            VSTOP = 9;
+            VSUSP = 10;
+            VEOL = 11;
+            VREPRINT = 12;
+            VDISCARD = 13;
+            VWERASE = 14;
+            VLNEXT = 15;
+            VEOL2 = 16;
+            VERASE2 = -1;
+            VDSUSP = -1;
+            VSTATUS = -1;
+
+            IGNBRK = 0x0000001;
+            BRKINT = 0x0000002;
+            IGNPAR = 0x0000004;
+            PARMRK = 0x0000010;
+            INPCK = 0x0000020;
+            ISTRIP = 0x0000040;
+            INLCR = 0x0000100;
+            IGNCR = 0x0000200;
+            ICRNL = 0x0000400;
+            IUCLC = 0x0001000;
+            IXON = 0x0002000;
+            IXANY = 0x0004000;
+            IXOFF = 0x0010000;
+            IMAXBEL = 0x0020000;
+            IUTF8 = 0x0040000;
+
+            OPOST = 0x0000001;
+            OLCUC = 0x0000002;
+            ONLCR = 0x0000004;
+            OCRNL = 0x0000010;
+            ONOCR = 0x0000020;
+            ONLRET = 0x0000040;
+            OFILL = 0x0000100;
+            OFDEL = 0x0000200;
+            NLDLY = 0x0000400;
+            NL0 = 0x0000000;
+            NL1 = 0x0000400;
+            CRDLY = 0x0003000;
+            CR0 = 0x0000000;
+            CR1 = 0x0001000;
+            CR2 = 0x0002000;
+            CR3 = 0x0003000;
+            TABDLY = 0x0014000;
+            TAB0 = 0x0000000;
+            TAB1 = 0x0004000;
+            TAB2 = 0x0010000;
+            TAB3 = 0x0014000;
+            XTABS = 0x0014000;
+            BSDLY = 0x0020000;
+            BS0 = 0x0000000;
+            BS1 = 0x0020000;
+            VTDLY = 0x0040000;
+            VT0 = 0x0000000;
+            VT1 = 0x0040000;
+            FFDLY = 0x0100000;
+            FF0 = 0x0000000;
+            FF1 = 0x0100000;
+
+            CBAUD = 0x0010017;
+            B0 = 0x0000000;
+            B50 = 0x0000001;
+            B75 = 0x0000002;
+            B110 = 0x0000003;
+            B134 = 0x0000004;
+            B150 = 0x0000005;
+            B200 = 0x0000006;
+            B300 = 0x0000007;
+            B600 = 0x0000010;
+            B1200 = 0x0000011;
+            B1800 = 0x0000012;
+            B2400 = 0x0000013;
+            B4800 = 0x0000014;
+            B9600 = 0x0000015;
+            B19200 = 0x0000016;
+            B38400 = 0x0000017;
+            EXTA = 0xB19200;
+            EXTB = 0xB38400;
+            CSIZE = 0x0000060;
+            CS5 = 0x0000000;
+            CS6 = 0x0000020;
+            CS7 = 0x0000040;
+            CS8 = 0x0000060;
+            CSTOPB = 0x0000100;
+            CREAD = 0x0000200;
+            PARENB = 0x0000400;
+            PARODD = 0x0001000;
+            HUPCL = 0x0002000;
+            CLOCAL = 0x0004000;
+
+            ISIG = 0x0000001;
+            ICANON = 0x0000002;
+            XCASE = 0x0000004;
+            ECHO = 0x0000010;
+            ECHOE = 0x0000020;
+            ECHOK = 0x0000040;
+            ECHONL = 0x0000100;
+            NOFLSH = 0x0000200;
+            TOSTOP = 0x0000400;
+            ECHOCTL = 0x0001000;
+            ECHOPRT = 0x0002000;
+            ECHOKE = 0x0004000;
+            FLUSHO = 0x0010000;
+            PENDIN = 0x0040000;
+            IEXTEN = 0x0100000;
+            EXTPROC = 0x0200000;
+        } else if (osName.startsWith("Mac") || osName.startsWith("Darwin")) {
+            TIOCGWINSZ = 0x40087468;
+            TIOCSWINSZ = 0x80087467;
+
+            TCSANOW = 0x00000000;
+
+            VEOF = 0;
+            VEOL = 1;
+            VEOL2 = 2;
+            VERASE = 3;
+            VWERASE = 4;
+            VKILL = 5;
+            VREPRINT = 6;
+            VINTR = 8;
+            VQUIT = 9;
+            VSUSP = 10;
+            VDSUSP = 11;
+            VSTART = 12;
+            VSTOP = 13;
+            VLNEXT = 14;
+            VDISCARD = 15;
+            VMIN = 16;
+            VTIME = 17;
+            VSTATUS = 18;
+            VERASE2 = -1;
+            VSWTC = -1;
+
+            IGNBRK = 0x00000001;
+            BRKINT = 0x00000002;
+            IGNPAR = 0x00000004;
+            PARMRK = 0x00000008;
+            INPCK = 0x00000010;
+            ISTRIP = 0x00000020;
+            INLCR = 0x00000040;
+            IGNCR = 0x00000080;
+            ICRNL = 0x00000100;
+            IXON = 0x00000200;
+            IXOFF = 0x00000400;
+            IXANY = 0x00000800;
+            IMAXBEL = 0x00002000;
+            IUTF8 = 0x00004000;
+
+            OPOST = 0x00000001;
+            ONLCR = 0x00000002;
+            OXTABS = 0x00000004;
+            ONOEOT = 0x00000008;
+            OCRNL = 0x00000010;
+            ONOCR = 0x00000020;
+            ONLRET = 0x00000040;
+            OFILL = 0x00000080;
+            NLDLY = 0x00000300;
+            TABDLY = 0x00000c04;
+            CRDLY = 0x00003000;
+            FFDLY = 0x00004000;
+            BSDLY = 0x00008000;
+            VTDLY = 0x00010000;
+            OFDEL = 0x00020000;
+
+            CIGNORE = 0x00000001;
+            CS5 = 0x00000000;
+            CS6 = 0x00000100;
+            CS7 = 0x00000200;
+            CS8 = 0x00000300;
+            CSTOPB = 0x00000400;
+            CREAD = 0x00000800;
+            PARENB = 0x00001000;
+            PARODD = 0x00002000;
+            HUPCL = 0x00004000;
+            CLOCAL = 0x00008000;
+            CCTS_OFLOW = 0x00010000;
+            CRTS_IFLOW = 0x00020000;
+            CDTR_IFLOW = 0x00040000;
+            CDSR_OFLOW = 0x00080000;
+            CCAR_OFLOW = 0x00100000;
+
+            ECHOKE = 0x00000001;
+            ECHOE = 0x00000002;
+            ECHOK = 0x00000004;
+            ECHO = 0x00000008;
+            ECHONL = 0x00000010;
+            ECHOPRT = 0x00000020;
+            ECHOCTL = 0x00000040;
+            ISIG = 0x00000080;
+            ICANON = 0x00000100;
+            ALTWERASE = 0x00000200;
+            IEXTEN = 0x00000400;
+            EXTPROC = 0x00000800;
+            TOSTOP = 0x00400000;
+            FLUSHO = 0x00800000;
+            NOKERNINFO = 0x02000000;
+            PENDIN = 0x20000000;
+            NOFLSH = 0x80000000;
+        } else if (osName.startsWith("FreeBSD")) {
+            TIOCGWINSZ = 0x40087468;
+            TIOCSWINSZ = 0x80087467;
+
+            TCSANOW = 0x0;
+            TCSADRAIN = 0x1;
+            TCSAFLUSH = 0x2;
+
+            VEOF = 0;
+            VEOL = 1;
+            VEOL2 = 2;
+            VERASE = 3;
+            VWERASE = 4;
+            VKILL = 5;
+            VREPRINT = 6;
+            VERASE2 = 7;
+            VINTR = 8;
+            VQUIT = 9;
+            VSUSP = 10;
+            VDSUSP = 11;
+            VSTART = 12;
+            VSTOP = 13;
+            VLNEXT = 14;
+            VDISCARD = 15;
+            VMIN = 16;
+            VTIME = 17;
+            VSTATUS = 18;
+            VSWTC = -1;
+
+            IGNBRK = 0x0000001;
+            BRKINT = 0x0000002;
+            IGNPAR = 0x0000004;
+            PARMRK = 0x0000008;
+            INPCK = 0x0000010;
+            ISTRIP = 0x0000020;
+            INLCR = 0x0000040;
+            IGNCR = 0x0000080;
+            ICRNL = 0x0000100;
+            IXON = 0x0000200;
+            IXOFF = 0x0000400;
+            IXANY = 0x0000800;
+            IMAXBEL = 0x0002000;
+
+            OPOST = 0x0000001;
+            ONLCR = 0x0000002;
+            TABDLY = 0x0000004;
+            TAB0 = 0x0000000;
+            TAB3 = 0x0000004;
+            ONOEOT = 0x0000008;
+            OCRNL = 0x0000010;
+            ONLRET = 0x0000040;
+
+            CIGNORE = 0x0000001;
+            CSIZE = 0x0000300;
+            CS5 = 0x0000000;
+            CS6 = 0x0000100;
+            CS7 = 0x0000200;
+            CS8 = 0x0000300;
+            CSTOPB = 0x0000400;
+            CREAD = 0x0000800;
+            PARENB = 0x0001000;
+            PARODD = 0x0002000;
+            HUPCL = 0x0004000;
+            CLOCAL = 0x0008000;
+
+            ECHOKE = 0x0000001;
+            ECHOE = 0x0000002;
+            ECHOK = 0x0000004;
+            ECHO = 0x0000008;
+            ECHONL = 0x0000010;
+            ECHOPRT = 0x0000020;
+            ECHOCTL = 0x0000040;
+            ISIG = 0x0000080;
+            ICANON = 0x0000100;
+            ALTWERASE = 0x000200;
+            IEXTEN = 0x0000400;
+            EXTPROC = 0x0000800;
+            TOSTOP = 0x0400000;
+            FLUSHO = 0x0800000;
+            PENDIN = 0x2000000;
+            NOFLSH = 0x8000000;
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmNativePty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmNativePty.java
new file mode 100644
index 0000000000000..1f8b668115aae
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmNativePty.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.impl.AbstractPty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+
+class FfmNativePty extends AbstractPty {
+    private final int master;
+    private final int slave;
+    private final int slaveOut;
+    private final String name;
+    private final FileDescriptor masterFD;
+    private final FileDescriptor slaveFD;
+    private final FileDescriptor slaveOutFD;
+
+    public FfmNativePty(TerminalProvider provider, SystemStream systemStream, int master, int slave, String name) {
+        this(
+                provider,
+                systemStream,
+                master,
+                newDescriptor(master),
+                slave,
+                newDescriptor(slave),
+                slave,
+                newDescriptor(slave),
+                name);
+    }
+
+    public FfmNativePty(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            int master,
+            FileDescriptor masterFD,
+            int slave,
+            FileDescriptor slaveFD,
+            int slaveOut,
+            FileDescriptor slaveOutFD,
+            String name) {
+        super(provider, systemStream);
+        this.master = master;
+        this.slave = slave;
+        this.slaveOut = slaveOut;
+        this.name = name;
+        this.masterFD = masterFD;
+        this.slaveFD = slaveFD;
+        this.slaveOutFD = slaveOutFD;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (master > 0) {
+            getMasterInput().close();
+        }
+        if (slave > 0) {
+            getSlaveInput().close();
+        }
+    }
+
+    public int getMaster() {
+        return master;
+    }
+
+    public int getSlave() {
+        return slave;
+    }
+
+    public int getSlaveOut() {
+        return slaveOut;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public FileDescriptor getMasterFD() {
+        return masterFD;
+    }
+
+    public FileDescriptor getSlaveFD() {
+        return slaveFD;
+    }
+
+    public FileDescriptor getSlaveOutFD() {
+        return slaveOutFD;
+    }
+
+    public InputStream getMasterInput() {
+        return new FileInputStream(getMasterFD());
+    }
+
+    public OutputStream getMasterOutput() {
+        return new FileOutputStream(getMasterFD());
+    }
+
+    protected InputStream doGetSlaveInput() {
+        return new FileInputStream(getSlaveFD());
+    }
+
+    public OutputStream getSlaveOutput() {
+        return new FileOutputStream(getSlaveOutFD());
+    }
+
+    @Override
+    public Attributes getAttr() throws IOException {
+        return CLibrary.getAttributes(slave);
+    }
+
+    @Override
+    protected void doSetAttr(Attributes attr) throws IOException {
+        CLibrary.setAttributes(slave, attr);
+    }
+
+    @Override
+    public Size getSize() throws IOException {
+        return CLibrary.getTerminalSize(slave);
+    }
+
+    @Override
+    public void setSize(Size size) throws IOException {
+        CLibrary.setTerminalSize(slave, size);
+    }
+
+    @Override
+    public String toString() {
+        return "FfmNativePty[" + getName() + "]";
+    }
+
+    public static boolean isPosixSystemStream(SystemStream stream) {
+        switch (stream) {
+            case Input:
+                return CLibrary.isTty(0);
+            case Output:
+                return CLibrary.isTty(1);
+            case Error:
+                return CLibrary.isTty(2);
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    public static String posixSystemStreamName(SystemStream stream) {
+        switch (stream) {
+            case Input:
+                return CLibrary.ttyName(0);
+            case Output:
+                return CLibrary.ttyName(1);
+            case Error:
+                return CLibrary.ttyName(2);
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    public static int systemStreamWidth(SystemStream systemStream) {
+        int fd = systemStream == SystemStream.Output ? 1 : 2;
+        return CLibrary.getTerminalSize(fd).getColumns();
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmTerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmTerminalProvider.java
new file mode 100644
index 0000000000000..76f07926b125b
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmTerminalProvider.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemoryLayout.PathElement;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.charset.Charset;
+import java.util.function.Function;
+
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.TerminalBuilder;
+import jdk.internal.org.jline.terminal.impl.PosixPtyTerminal;
+import jdk.internal.org.jline.terminal.impl.PosixSysTerminal;
+import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.utils.OSUtils;
+
+public class FfmTerminalProvider implements TerminalProvider {
+
+    public FfmTerminalProvider() {
+        if (!FfmTerminalProvider.class.getModule().isNativeAccessEnabled()) {
+            throw new UnsupportedOperationException(
+                    "Native access is not enabled for the current module: " + FfmTerminalProvider.class.getModule());
+        }
+    }
+
+    @Override
+    public String name() {
+        return TerminalBuilder.PROP_PROVIDER_FFM;
+    }
+
+    @Override
+    public Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        if (OSUtils.IS_WINDOWS) {
+            return NativeWinSysTerminal.createTerminal(
+                    this, systemStream, name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, inputStreamWrapper);
+        } else {
+            Pty pty = new FfmNativePty(
+                    this,
+                    systemStream,
+                    -1,
+                    null,
+                    0,
+                    FileDescriptor.in,
+                    systemStream == SystemStream.Output ? 1 : 2,
+                    systemStream == SystemStream.Output ? FileDescriptor.out : FileDescriptor.err,
+                    CLibrary.ttyName(0));
+            return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler, inputStreamWrapper);
+        }
+    }
+
+    @Override
+    public Terminal newTerminal(
+            String name,
+            String type,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
+        Pty pty = CLibrary.openpty(this, attributes, size);
+        return new PosixPtyTerminal(name, type, pty, in, out, encoding, signalHandler, paused);
+    }
+
+    @Override
+    public boolean isSystemStream(SystemStream stream) {
+        if (OSUtils.IS_WINDOWS) {
+            return isWindowsSystemStream(stream);
+        } else {
+            return isPosixSystemStream(stream);
+        }
+    }
+
+    public boolean isWindowsSystemStream(SystemStream stream) {
+        return NativeWinSysTerminal.isWindowsSystemStream(stream);
+    }
+
+    public boolean isPosixSystemStream(SystemStream stream) {
+        return FfmNativePty.isPosixSystemStream(stream);
+    }
+
+    @Override
+    public String systemStreamName(SystemStream stream) {
+        return FfmNativePty.posixSystemStreamName(stream);
+    }
+
+    @Override
+    public int systemStreamWidth(SystemStream stream) {
+        return FfmNativePty.systemStreamWidth(stream);
+    }
+
+    @Override
+    public String toString() {
+        return "TerminalProvider[" + name() + "]";
+    }
+
+    static VarHandle lookupVarHandle(MemoryLayout layout, PathElement... element) {
+        VarHandle h = layout.varHandle(element);
+
+        // the last parameter of the VarHandle is additional offset, hardcode zero:
+        h = MethodHandles.insertCoordinates(h, h.coordinateTypes().size() - 1, 0L);
+
+        return h;
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
new file mode 100644
index 0000000000000..0c485819f57dc
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
@@ -0,0 +1,927 @@
+/*
+ * Copyright (c) 2009-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.IOException;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.VarHandle;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+@SuppressWarnings({"unused", "restricted"})
+final class Kernel32 {
+
+    public static final int FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000;
+
+    public static final int INVALID_HANDLE_VALUE = -1;
+    public static final int STD_INPUT_HANDLE = -10;
+    public static final int STD_OUTPUT_HANDLE = -11;
+    public static final int STD_ERROR_HANDLE = -12;
+
+    public static final int ENABLE_PROCESSED_INPUT = 0x0001;
+    public static final int ENABLE_LINE_INPUT = 0x0002;
+    public static final int ENABLE_ECHO_INPUT = 0x0004;
+    public static final int ENABLE_WINDOW_INPUT = 0x0008;
+    public static final int ENABLE_MOUSE_INPUT = 0x0010;
+    public static final int ENABLE_INSERT_MODE = 0x0020;
+    public static final int ENABLE_QUICK_EDIT_MODE = 0x0040;
+    public static final int ENABLE_EXTENDED_FLAGS = 0x0080;
+
+    public static final int RIGHT_ALT_PRESSED = 0x0001;
+    public static final int LEFT_ALT_PRESSED = 0x0002;
+    public static final int RIGHT_CTRL_PRESSED = 0x0004;
+    public static final int LEFT_CTRL_PRESSED = 0x0008;
+    public static final int SHIFT_PRESSED = 0x0010;
+
+    public static final int FOREGROUND_BLUE = 0x0001;
+    public static final int FOREGROUND_GREEN = 0x0002;
+    public static final int FOREGROUND_RED = 0x0004;
+    public static final int FOREGROUND_INTENSITY = 0x0008;
+    public static final int BACKGROUND_BLUE = 0x0010;
+    public static final int BACKGROUND_GREEN = 0x0020;
+    public static final int BACKGROUND_RED = 0x0040;
+    public static final int BACKGROUND_INTENSITY = 0x0080;
+
+    // Button state
+    public static final int FROM_LEFT_1ST_BUTTON_PRESSED = 0x0001;
+    public static final int RIGHTMOST_BUTTON_PRESSED = 0x0002;
+    public static final int FROM_LEFT_2ND_BUTTON_PRESSED = 0x0004;
+    public static final int FROM_LEFT_3RD_BUTTON_PRESSED = 0x0008;
+    public static final int FROM_LEFT_4TH_BUTTON_PRESSED = 0x0010;
+
+    // Event flags
+    public static final int MOUSE_MOVED = 0x0001;
+    public static final int DOUBLE_CLICK = 0x0002;
+    public static final int MOUSE_WHEELED = 0x0004;
+    public static final int MOUSE_HWHEELED = 0x0008;
+
+    // Event types
+    public static final short KEY_EVENT = 0x0001;
+    public static final short MOUSE_EVENT = 0x0002;
+    public static final short WINDOW_BUFFER_SIZE_EVENT = 0x0004;
+    public static final short MENU_EVENT = 0x0008;
+    public static final short FOCUS_EVENT = 0x0010;
+
+    public static int WaitForSingleObject(java.lang.foreign.MemorySegment hHandle, int dwMilliseconds) {
+        MethodHandle mh$ = requireNonNull(WaitForSingleObject$MH, "WaitForSingleObject");
+        try {
+            return (int) mh$.invokeExact(hHandle, dwMilliseconds);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static java.lang.foreign.MemorySegment GetStdHandle(int nStdHandle) {
+        MethodHandle mh$ = requireNonNull(GetStdHandle$MH, "GetStdHandle");
+        try {
+            return (java.lang.foreign.MemorySegment) mh$.invokeExact(nStdHandle);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int FormatMessageW(
+            int dwFlags,
+            java.lang.foreign.MemorySegment lpSource,
+            int dwMessageId,
+            int dwLanguageId,
+            java.lang.foreign.MemorySegment lpBuffer,
+            int nSize,
+            java.lang.foreign.MemorySegment Arguments) {
+        MethodHandle mh$ = requireNonNull(FormatMessageW$MH, "FormatMessageW");
+        try {
+            return (int) mh$.invokeExact(dwFlags, lpSource, dwMessageId, dwLanguageId, lpBuffer, nSize, Arguments);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int SetConsoleTextAttribute(java.lang.foreign.MemorySegment hConsoleOutput, short wAttributes) {
+        MethodHandle mh$ = requireNonNull(SetConsoleTextAttribute$MH, "SetConsoleTextAttribute");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, wAttributes);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int SetConsoleMode(java.lang.foreign.MemorySegment hConsoleHandle, int dwMode) {
+        MethodHandle mh$ = requireNonNull(SetConsoleMode$MH, "SetConsoleMode");
+        try {
+            return (int) mh$.invokeExact(hConsoleHandle, dwMode);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int GetConsoleMode(
+            java.lang.foreign.MemorySegment hConsoleHandle, java.lang.foreign.MemorySegment lpMode) {
+        MethodHandle mh$ = requireNonNull(GetConsoleMode$MH, "GetConsoleMode");
+        try {
+            return (int) mh$.invokeExact(hConsoleHandle, lpMode);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int SetConsoleTitleW(java.lang.foreign.MemorySegment lpConsoleTitle) {
+        MethodHandle mh$ = requireNonNull(SetConsoleTitleW$MH, "SetConsoleTitleW");
+        try {
+            return (int) mh$.invokeExact(lpConsoleTitle);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int SetConsoleCursorPosition(java.lang.foreign.MemorySegment hConsoleOutput, COORD dwCursorPosition) {
+        MethodHandle mh$ = requireNonNull(SetConsoleCursorPosition$MH, "SetConsoleCursorPosition");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, dwCursorPosition.seg);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int FillConsoleOutputCharacterW(
+            java.lang.foreign.MemorySegment hConsoleOutput,
+            char cCharacter,
+            int nLength,
+            COORD dwWriteCoord,
+            java.lang.foreign.MemorySegment lpNumberOfCharsWritten) {
+        MethodHandle mh$ = requireNonNull(FillConsoleOutputCharacterW$MH, "FillConsoleOutputCharacterW");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, cCharacter, nLength, dwWriteCoord.seg, lpNumberOfCharsWritten);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int FillConsoleOutputAttribute(
+            java.lang.foreign.MemorySegment hConsoleOutput,
+            short wAttribute,
+            int nLength,
+            COORD dwWriteCoord,
+            java.lang.foreign.MemorySegment lpNumberOfAttrsWritten) {
+        MethodHandle mh$ = requireNonNull(FillConsoleOutputAttribute$MH, "FillConsoleOutputAttribute");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, wAttribute, nLength, dwWriteCoord.seg, lpNumberOfAttrsWritten);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int WriteConsoleW(
+            java.lang.foreign.MemorySegment hConsoleOutput,
+            java.lang.foreign.MemorySegment lpBuffer,
+            int nNumberOfCharsToWrite,
+            java.lang.foreign.MemorySegment lpNumberOfCharsWritten,
+            java.lang.foreign.MemorySegment lpReserved) {
+        MethodHandle mh$ = requireNonNull(WriteConsoleW$MH, "WriteConsoleW");
+        try {
+            return (int) mh$.invokeExact(
+                    hConsoleOutput, lpBuffer, nNumberOfCharsToWrite, lpNumberOfCharsWritten, lpReserved);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int ReadConsoleInputW(
+            java.lang.foreign.MemorySegment hConsoleInput,
+            java.lang.foreign.MemorySegment lpBuffer,
+            int nLength,
+            java.lang.foreign.MemorySegment lpNumberOfEventsRead) {
+        MethodHandle mh$ = requireNonNull(ReadConsoleInputW$MH, "ReadConsoleInputW");
+        try {
+            return (int) mh$.invokeExact(hConsoleInput, lpBuffer, nLength, lpNumberOfEventsRead);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int PeekConsoleInputW(
+            java.lang.foreign.MemorySegment hConsoleInput,
+            java.lang.foreign.MemorySegment lpBuffer,
+            int nLength,
+            java.lang.foreign.MemorySegment lpNumberOfEventsRead) {
+        MethodHandle mh$ = requireNonNull(PeekConsoleInputW$MH, "PeekConsoleInputW");
+        try {
+            return (int) mh$.invokeExact(hConsoleInput, lpBuffer, nLength, lpNumberOfEventsRead);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int GetConsoleScreenBufferInfo(
+            java.lang.foreign.MemorySegment hConsoleOutput, CONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo) {
+        MethodHandle mh$ = requireNonNull(GetConsoleScreenBufferInfo$MH, "GetConsoleScreenBufferInfo");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, lpConsoleScreenBufferInfo.seg);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int ScrollConsoleScreenBuffer(
+            java.lang.foreign.MemorySegment hConsoleOutput,
+            SMALL_RECT lpScrollRectangle,
+            SMALL_RECT lpClipRectangle,
+            COORD dwDestinationOrigin,
+            CHAR_INFO lpFill) {
+        MethodHandle mh$ = requireNonNull(ScrollConsoleScreenBufferW$MH, "ScrollConsoleScreenBuffer");
+        try {
+            return (int)
+                    mh$.invokeExact(hConsoleOutput, lpScrollRectangle, lpClipRectangle, dwDestinationOrigin, lpFill);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int GetLastError() {
+        MethodHandle mh$ = requireNonNull(GetLastError$MH, "GetLastError");
+        try {
+            return (int) mh$.invokeExact();
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int GetFileType(java.lang.foreign.MemorySegment hFile) {
+        MethodHandle mh$ = requireNonNull(GetFileType$MH, "GetFileType");
+        try {
+            return (int) mh$.invokeExact(hFile);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static java.lang.foreign.MemorySegment _get_osfhandle(int fd) {
+        MethodHandle mh$ = requireNonNull(_get_osfhandle$MH, "_get_osfhandle");
+        try {
+            return (java.lang.foreign.MemorySegment) mh$.invokeExact(fd);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static INPUT_RECORD[] readConsoleInputHelper(java.lang.foreign.MemorySegment handle, int count, boolean peek)
+            throws IOException {
+        return readConsoleInputHelper(java.lang.foreign.Arena.ofAuto(), handle, count, peek);
+    }
+
+    public static INPUT_RECORD[] readConsoleInputHelper(
+            java.lang.foreign.Arena arena, java.lang.foreign.MemorySegment handle, int count, boolean peek)
+            throws IOException {
+        java.lang.foreign.MemorySegment inputRecordPtr = arena.allocate(INPUT_RECORD.LAYOUT, count);
+        java.lang.foreign.MemorySegment length = arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT, 1);
+        int res = peek
+                ? PeekConsoleInputW(handle, inputRecordPtr, count, length)
+                : ReadConsoleInputW(handle, inputRecordPtr, count, length);
+        if (res == 0) {
+            throw new IOException("ReadConsoleInputW failed: " + getLastErrorMessage());
+        }
+        int len = length.get(java.lang.foreign.ValueLayout.JAVA_INT, 0);
+        return inputRecordPtr
+                .elements(INPUT_RECORD.LAYOUT)
+                .map(INPUT_RECORD::new)
+                .limit(len)
+                .toArray(INPUT_RECORD[]::new);
+    }
+
+    public static String getLastErrorMessage() {
+        int errorCode = GetLastError();
+        return getErrorMessage(errorCode);
+    }
+
+    public static String getErrorMessage(int errorCode) {
+        int bufferSize = 160;
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment data = arena.allocate(bufferSize);
+            FormatMessageW(
+                    FORMAT_MESSAGE_FROM_SYSTEM,
+                    java.lang.foreign.MemorySegment.NULL,
+                    errorCode,
+                    0,
+                    data,
+                    bufferSize,
+                    java.lang.foreign.MemorySegment.NULL);
+            return new String(data.toArray(java.lang.foreign.ValueLayout.JAVA_BYTE), StandardCharsets.UTF_16LE).trim();
+        }
+    }
+
+    private static final java.lang.foreign.SymbolLookup SYMBOL_LOOKUP;
+
+    static {
+        System.loadLibrary("msvcrt");
+        System.loadLibrary("Kernel32");
+        SYMBOL_LOOKUP = java.lang.foreign.SymbolLookup.loaderLookup();
+    }
+
+    static MethodHandle downcallHandle(String name, java.lang.foreign.FunctionDescriptor fdesc) {
+        return SYMBOL_LOOKUP
+                .find(name)
+                .map(addr -> java.lang.foreign.Linker.nativeLinker().downcallHandle(addr, fdesc))
+                .orElse(null);
+    }
+
+    static final java.lang.foreign.ValueLayout.OfBoolean C_BOOL$LAYOUT = java.lang.foreign.ValueLayout.JAVA_BOOLEAN;
+    static final java.lang.foreign.ValueLayout.OfByte C_CHAR$LAYOUT = java.lang.foreign.ValueLayout.JAVA_BYTE;
+    static final java.lang.foreign.ValueLayout.OfChar C_WCHAR$LAYOUT = java.lang.foreign.ValueLayout.JAVA_CHAR;
+    static final java.lang.foreign.ValueLayout.OfShort C_SHORT$LAYOUT = java.lang.foreign.ValueLayout.JAVA_SHORT;
+    static final java.lang.foreign.ValueLayout.OfShort C_WORD$LAYOUT = java.lang.foreign.ValueLayout.JAVA_SHORT;
+    static final java.lang.foreign.ValueLayout.OfInt C_DWORD$LAYOUT = java.lang.foreign.ValueLayout.JAVA_INT;
+    static final java.lang.foreign.ValueLayout.OfInt C_INT$LAYOUT = java.lang.foreign.ValueLayout.JAVA_INT;
+    static final java.lang.foreign.ValueLayout.OfLong C_LONG$LAYOUT = java.lang.foreign.ValueLayout.JAVA_LONG;
+    static final java.lang.foreign.ValueLayout.OfLong C_LONG_LONG$LAYOUT = java.lang.foreign.ValueLayout.JAVA_LONG;
+    static final java.lang.foreign.ValueLayout.OfFloat C_FLOAT$LAYOUT = java.lang.foreign.ValueLayout.JAVA_FLOAT;
+    static final java.lang.foreign.ValueLayout.OfDouble C_DOUBLE$LAYOUT = java.lang.foreign.ValueLayout.JAVA_DOUBLE;
+    static final java.lang.foreign.AddressLayout C_POINTER$LAYOUT = java.lang.foreign.ValueLayout.ADDRESS;
+
+    static final MethodHandle WaitForSingleObject$MH = downcallHandle(
+            "WaitForSingleObject",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_INT$LAYOUT));
+    static final MethodHandle GetStdHandle$MH =
+            downcallHandle("GetStdHandle", java.lang.foreign.FunctionDescriptor.of(C_POINTER$LAYOUT, C_INT$LAYOUT));
+    static final MethodHandle FormatMessageW$MH = downcallHandle(
+            "FormatMessageW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT));
+    static final MethodHandle SetConsoleTextAttribute$MH = downcallHandle(
+            "SetConsoleTextAttribute",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_SHORT$LAYOUT));
+    static final MethodHandle SetConsoleMode$MH = downcallHandle(
+            "SetConsoleMode", java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_INT$LAYOUT));
+    static final MethodHandle GetConsoleMode$MH = downcallHandle(
+            "GetConsoleMode",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_POINTER$LAYOUT));
+
+    static final MethodHandle SetConsoleTitleW$MH =
+            downcallHandle("SetConsoleTitleW", java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle SetConsoleCursorPosition$MH = downcallHandle(
+            "SetConsoleCursorPosition",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, COORD.LAYOUT));
+    static final MethodHandle FillConsoleOutputCharacterW$MH = downcallHandle(
+            "FillConsoleOutputCharacterW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT, C_POINTER$LAYOUT, C_WCHAR$LAYOUT, C_INT$LAYOUT, COORD.LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle FillConsoleOutputAttribute$MH = downcallHandle(
+            "FillConsoleOutputAttribute",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT, C_POINTER$LAYOUT, C_SHORT$LAYOUT, C_INT$LAYOUT, COORD.LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle WriteConsoleW$MH = downcallHandle(
+            "WriteConsoleW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_POINTER$LAYOUT));
+
+    static final MethodHandle ReadConsoleInputW$MH = downcallHandle(
+            "ReadConsoleInputW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT, C_POINTER$LAYOUT, C_POINTER$LAYOUT, C_INT$LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle PeekConsoleInputW$MH = downcallHandle(
+            "PeekConsoleInputW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT, C_POINTER$LAYOUT, C_POINTER$LAYOUT, C_INT$LAYOUT, C_POINTER$LAYOUT));
+
+    static final MethodHandle GetConsoleScreenBufferInfo$MH = downcallHandle(
+            "GetConsoleScreenBufferInfo",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_POINTER$LAYOUT));
+
+    static final MethodHandle ScrollConsoleScreenBufferW$MH = downcallHandle(
+            "ScrollConsoleScreenBufferW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    COORD.LAYOUT,
+                    C_POINTER$LAYOUT));
+    static final MethodHandle GetLastError$MH =
+            downcallHandle("GetLastError", java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT));
+    static final MethodHandle GetFileType$MH =
+            downcallHandle("GetFileType", java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle _get_osfhandle$MH =
+            downcallHandle("_get_osfhandle", java.lang.foreign.FunctionDescriptor.of(C_POINTER$LAYOUT, C_INT$LAYOUT));
+
+    public static final class INPUT_RECORD {
+        static final java.lang.foreign.MemoryLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                java.lang.foreign.ValueLayout.JAVA_SHORT.withName("EventType"),
+                java.lang.foreign.ValueLayout.JAVA_SHORT, // padding
+                java.lang.foreign.MemoryLayout.unionLayout(
+                                KEY_EVENT_RECORD.LAYOUT.withName("KeyEvent"),
+                                MOUSE_EVENT_RECORD.LAYOUT.withName("MouseEvent"),
+                                WINDOW_BUFFER_SIZE_RECORD.LAYOUT.withName("WindowBufferSizeEvent"),
+                                MENU_EVENT_RECORD.LAYOUT.withName("MenuEvent"),
+                                FOCUS_EVENT_RECORD.LAYOUT.withName("FocusEvent"))
+                        .withName("Event"));
+        static final VarHandle EventType$VH = varHandle(LAYOUT, "EventType");
+        static final long Event$OFFSET = byteOffset(LAYOUT, "Event");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public INPUT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public INPUT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public INPUT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public short eventType() {
+            return (short) EventType$VH.get(seg);
+        }
+
+        public KEY_EVENT_RECORD keyEvent() {
+            return new KEY_EVENT_RECORD(seg, Event$OFFSET);
+        }
+
+        public MOUSE_EVENT_RECORD mouseEvent() {
+            return new MOUSE_EVENT_RECORD(seg, Event$OFFSET);
+        }
+
+        public FOCUS_EVENT_RECORD focusEvent() {
+            return new FOCUS_EVENT_RECORD(seg, Event$OFFSET);
+        }
+    }
+
+    public static final class MENU_EVENT_RECORD {
+
+        static final java.lang.foreign.GroupLayout LAYOUT =
+                java.lang.foreign.MemoryLayout.structLayout(C_DWORD$LAYOUT.withName("dwCommandId"));
+        static final VarHandle COMMAND_ID = varHandle(LAYOUT, "dwCommandId");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public MENU_EVENT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public MENU_EVENT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public MENU_EVENT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public int commandId() {
+            return (int) MENU_EVENT_RECORD.COMMAND_ID.get(seg);
+        }
+
+        public void commandId(int commandId) {
+            MENU_EVENT_RECORD.COMMAND_ID.set(seg, commandId);
+        }
+    }
+
+    public static final class FOCUS_EVENT_RECORD {
+
+        static final java.lang.foreign.GroupLayout LAYOUT =
+                java.lang.foreign.MemoryLayout.structLayout(C_INT$LAYOUT.withName("bSetFocus"));
+        static final VarHandle SET_FOCUS = varHandle(LAYOUT, "bSetFocus");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public FOCUS_EVENT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public FOCUS_EVENT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public FOCUS_EVENT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = Objects.requireNonNull(seg);
+        }
+
+        public FOCUS_EVENT_RECORD(java.lang.foreign.MemorySegment seg, long offset) {
+            this.seg = Objects.requireNonNull(seg).asSlice(offset, LAYOUT.byteSize());
+        }
+
+        public boolean setFocus() {
+            return ((int) FOCUS_EVENT_RECORD.SET_FOCUS.get(seg) != 0);
+        }
+
+        public void setFocus(boolean setFocus) {
+            FOCUS_EVENT_RECORD.SET_FOCUS.set(seg, setFocus ? 1 : 0);
+        }
+    }
+
+    public static final class WINDOW_BUFFER_SIZE_RECORD {
+
+        static final java.lang.foreign.GroupLayout LAYOUT =
+                java.lang.foreign.MemoryLayout.structLayout(COORD.LAYOUT.withName("size"));
+        static final long SIZE_OFFSET = byteOffset(LAYOUT, "size");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public WINDOW_BUFFER_SIZE_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public WINDOW_BUFFER_SIZE_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public WINDOW_BUFFER_SIZE_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public COORD size() {
+            return new COORD(seg, SIZE_OFFSET);
+        }
+
+        public String toString() {
+            return "WINDOW_BUFFER_SIZE_RECORD{size=" + this.size() + '}';
+        }
+    }
+
+    public static final class MOUSE_EVENT_RECORD {
+
+        static final java.lang.foreign.MemoryLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                COORD.LAYOUT.withName("dwMousePosition"),
+                C_DWORD$LAYOUT.withName("dwButtonState"),
+                C_DWORD$LAYOUT.withName("dwControlKeyState"),
+                C_DWORD$LAYOUT.withName("dwEventFlags"));
+        static final long MOUSE_POSITION_OFFSET = byteOffset(LAYOUT, "dwMousePosition");
+        static final VarHandle BUTTON_STATE = varHandle(LAYOUT, "dwButtonState");
+        static final VarHandle CONTROL_KEY_STATE = varHandle(LAYOUT, "dwControlKeyState");
+        static final VarHandle EVENT_FLAGS = varHandle(LAYOUT, "dwEventFlags");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public MOUSE_EVENT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public MOUSE_EVENT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public MOUSE_EVENT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = Objects.requireNonNull(seg);
+        }
+
+        public MOUSE_EVENT_RECORD(java.lang.foreign.MemorySegment seg, long offset) {
+            this.seg = Objects.requireNonNull(seg).asSlice(offset, LAYOUT.byteSize());
+        }
+
+        public COORD mousePosition() {
+            return new COORD(seg, MOUSE_POSITION_OFFSET);
+        }
+
+        public int buttonState() {
+            return (int) BUTTON_STATE.get(seg);
+        }
+
+        public int controlKeyState() {
+            return (int) CONTROL_KEY_STATE.get(seg);
+        }
+
+        public int eventFlags() {
+            return (int) EVENT_FLAGS.get(seg);
+        }
+
+        public String toString() {
+            return "MOUSE_EVENT_RECORD{mousePosition=" + mousePosition() + ", buttonState=" + buttonState()
+                    + ", controlKeyState=" + controlKeyState() + ", eventFlags=" + eventFlags() + '}';
+        }
+    }
+
+    public static final class KEY_EVENT_RECORD {
+
+        static final java.lang.foreign.MemoryLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                java.lang.foreign.ValueLayout.JAVA_INT.withName("bKeyDown"),
+                java.lang.foreign.ValueLayout.JAVA_SHORT.withName("wRepeatCount"),
+                java.lang.foreign.ValueLayout.JAVA_SHORT.withName("wVirtualKeyCode"),
+                java.lang.foreign.ValueLayout.JAVA_SHORT.withName("wVirtualScanCode"),
+                java.lang.foreign.MemoryLayout.unionLayout(
+                                java.lang.foreign.ValueLayout.JAVA_CHAR.withName("UnicodeChar"),
+                                java.lang.foreign.ValueLayout.JAVA_BYTE.withName("AsciiChar"))
+                        .withName("uChar"),
+                java.lang.foreign.ValueLayout.JAVA_INT.withName("dwControlKeyState"));
+        static final VarHandle bKeyDown$VH = varHandle(LAYOUT, "bKeyDown");
+        static final VarHandle wRepeatCount$VH = varHandle(LAYOUT, "wRepeatCount");
+        static final VarHandle wVirtualKeyCode$VH = varHandle(LAYOUT, "wVirtualKeyCode");
+        static final VarHandle wVirtualScanCode$VH = varHandle(LAYOUT, "wVirtualScanCode");
+        static final VarHandle UnicodeChar$VH = varHandle(LAYOUT, "uChar", "UnicodeChar");
+        static final VarHandle AsciiChar$VH = varHandle(LAYOUT, "uChar", "AsciiChar");
+        static final VarHandle dwControlKeyState$VH = varHandle(LAYOUT, "dwControlKeyState");
+
+        final java.lang.foreign.MemorySegment seg;
+
+        public KEY_EVENT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public KEY_EVENT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public KEY_EVENT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public KEY_EVENT_RECORD(java.lang.foreign.MemorySegment seg, long offset) {
+            this.seg = Objects.requireNonNull(seg).asSlice(offset, LAYOUT.byteSize());
+        }
+
+        public boolean keyDown() {
+            return ((int) bKeyDown$VH.get(seg)) != 0;
+        }
+
+        public int repeatCount() {
+            return (int) wRepeatCount$VH.get(seg);
+        }
+
+        public short keyCode() {
+            return (short) wVirtualKeyCode$VH.get(seg);
+        }
+
+        public short scanCode() {
+            return (short) wVirtualScanCode$VH.get(seg);
+        }
+
+        public char uchar() {
+            return (char) UnicodeChar$VH.get(seg);
+        }
+
+        public int controlKeyState() {
+            return (int) dwControlKeyState$VH.get(seg);
+        }
+
+        public String toString() {
+            return "KEY_EVENT_RECORD{keyDown=" + this.keyDown() + ", repeatCount=" + this.repeatCount() + ", keyCode="
+                    + this.keyCode() + ", scanCode=" + this.scanCode() + ", uchar=" + this.uchar()
+                    + ", controlKeyState="
+                    + this.controlKeyState() + '}';
+        }
+    }
+
+    public static final class CHAR_INFO {
+
+        static final java.lang.foreign.GroupLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                java.lang.foreign.MemoryLayout.unionLayout(
+                                C_WCHAR$LAYOUT.withName("UnicodeChar"), C_CHAR$LAYOUT.withName("AsciiChar"))
+                        .withName("Char"),
+                C_WORD$LAYOUT.withName("Attributes"));
+        static final VarHandle UnicodeChar$VH = varHandle(LAYOUT, "Char", "UnicodeChar");
+        static final VarHandle Attributes$VH = varHandle(LAYOUT, "Attributes");
+
+        final java.lang.foreign.MemorySegment seg;
+
+        public CHAR_INFO() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public CHAR_INFO(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public CHAR_INFO(java.lang.foreign.Arena arena, char c, short a) {
+            this(arena);
+            UnicodeChar$VH.set(seg, c);
+            Attributes$VH.set(seg, a);
+        }
+
+        public CHAR_INFO(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public char unicodeChar() {
+            return (char) UnicodeChar$VH.get(seg);
+        }
+    }
+
+    public static final class CONSOLE_SCREEN_BUFFER_INFO {
+        static final java.lang.foreign.GroupLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                COORD.LAYOUT.withName("dwSize"),
+                COORD.LAYOUT.withName("dwCursorPosition"),
+                C_WORD$LAYOUT.withName("wAttributes"),
+                SMALL_RECT.LAYOUT.withName("srWindow"),
+                COORD.LAYOUT.withName("dwMaximumWindowSize"));
+        static final long dwSize$OFFSET = byteOffset(LAYOUT, "dwSize");
+        static final long dwCursorPosition$OFFSET = byteOffset(LAYOUT, "dwCursorPosition");
+        static final VarHandle wAttributes$VH = varHandle(LAYOUT, "wAttributes");
+        static final long srWindow$OFFSET = byteOffset(LAYOUT, "srWindow");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public CONSOLE_SCREEN_BUFFER_INFO() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public CONSOLE_SCREEN_BUFFER_INFO(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public CONSOLE_SCREEN_BUFFER_INFO(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public COORD size() {
+            return new COORD(seg, dwSize$OFFSET);
+        }
+
+        public COORD cursorPosition() {
+            return new COORD(seg, dwCursorPosition$OFFSET);
+        }
+
+        public short attributes() {
+            return (short) wAttributes$VH.get(seg);
+        }
+
+        public SMALL_RECT window() {
+            return new SMALL_RECT(seg, srWindow$OFFSET);
+        }
+
+        public int windowWidth() {
+            return this.window().width() + 1;
+        }
+
+        public int windowHeight() {
+            return this.window().height() + 1;
+        }
+
+        public void attributes(short attr) {
+            wAttributes$VH.set(seg, attr);
+        }
+    }
+
+    public static final class COORD {
+
+        static final java.lang.foreign.GroupLayout LAYOUT =
+                java.lang.foreign.MemoryLayout.structLayout(C_SHORT$LAYOUT.withName("x"), C_SHORT$LAYOUT.withName("y"));
+        static final VarHandle x$VH = varHandle(LAYOUT, "x");
+        static final VarHandle y$VH = varHandle(LAYOUT, "y");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public COORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public COORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public COORD(java.lang.foreign.Arena arena, short x, short y) {
+            this(arena.allocate(LAYOUT));
+            x(x);
+            y(y);
+        }
+
+        public COORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public COORD(java.lang.foreign.MemorySegment seg, long offset) {
+            this.seg = Objects.requireNonNull(seg).asSlice(offset, LAYOUT.byteSize());
+        }
+
+        public short x() {
+            return (short) COORD.x$VH.get(seg);
+        }
+
+        public void x(short x) {
+            COORD.x$VH.set(seg, x);
+        }
+
+        public short y() {
+            return (short) COORD.y$VH.get(seg);
+        }
+
+        public void y(short y) {
+            COORD.y$VH.set(seg, y);
+        }
+
+        public COORD copy(java.lang.foreign.Arena arena) {
+            return new COORD(arena.allocate(LAYOUT).copyFrom(seg));
+        }
+    }
+
+    public static final class SMALL_RECT {
+
+        static final java.lang.foreign.GroupLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                C_SHORT$LAYOUT.withName("Left"),
+                C_SHORT$LAYOUT.withName("Top"),
+                C_SHORT$LAYOUT.withName("Right"),
+                C_SHORT$LAYOUT.withName("Bottom"));
+        static final VarHandle Left$VH = varHandle(LAYOUT, "Left");
+        static final VarHandle Top$VH = varHandle(LAYOUT, "Top");
+        static final VarHandle Right$VH = varHandle(LAYOUT, "Right");
+        static final VarHandle Bottom$VH = varHandle(LAYOUT, "Bottom");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public SMALL_RECT() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public SMALL_RECT(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public SMALL_RECT(java.lang.foreign.Arena arena, SMALL_RECT rect) {
+            this(arena);
+            left(rect.left());
+            right(rect.right());
+            top(rect.top());
+            bottom(rect.bottom());
+        }
+
+        public SMALL_RECT(java.lang.foreign.MemorySegment seg, long offset) {
+            this(seg.asSlice(offset, LAYOUT.byteSize()));
+        }
+
+        public SMALL_RECT(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public short left() {
+            return (short) Left$VH.get(seg);
+        }
+
+        public short top() {
+            return (short) Top$VH.get(seg);
+        }
+
+        public short right() {
+            return (short) Right$VH.get(seg);
+        }
+
+        public short bottom() {
+            return (short) Bottom$VH.get(seg);
+        }
+
+        public short width() {
+            return (short) (this.right() - this.left());
+        }
+
+        public short height() {
+            return (short) (this.bottom() - this.top());
+        }
+
+        public void left(short l) {
+            Left$VH.set(seg, l);
+        }
+
+        public void top(short t) {
+            Top$VH.set(seg, t);
+        }
+
+        public void right(short r) {
+            Right$VH.set(seg, r);
+        }
+
+        public void bottom(short b) {
+            Bottom$VH.set(seg, b);
+        }
+
+        public SMALL_RECT copy(java.lang.foreign.Arena arena) {
+            return new SMALL_RECT(arena.allocate(LAYOUT).copyFrom(seg));
+        }
+    }
+
+    static <T> T requireNonNull(T obj, String symbolName) {
+        if (obj == null) {
+            throw new UnsatisfiedLinkError("unresolved symbol: " + symbolName);
+        }
+        return obj;
+    }
+
+    static VarHandle varHandle(java.lang.foreign.MemoryLayout layout, String name) {
+        return FfmTerminalProvider.lookupVarHandle(
+                layout, java.lang.foreign.MemoryLayout.PathElement.groupElement(name));
+    }
+
+    static VarHandle varHandle(java.lang.foreign.MemoryLayout layout, String e1, String name) {
+        return FfmTerminalProvider.lookupVarHandle(
+                layout,
+                java.lang.foreign.MemoryLayout.PathElement.groupElement(e1),
+                java.lang.foreign.MemoryLayout.PathElement.groupElement(name));
+    }
+
+    static long byteOffset(java.lang.foreign.MemoryLayout layout, String name) {
+        return layout.byteOffset(java.lang.foreign.MemoryLayout.PathElement.groupElement(name));
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinConsoleWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinConsoleWriter.java
new file mode 100644
index 0000000000000..55a2ec650552a
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinConsoleWriter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.IOException;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+
+import jdk.internal.org.jline.terminal.impl.AbstractWindowsConsoleWriter;
+
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetStdHandle;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_OUTPUT_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.WriteConsoleW;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.getLastErrorMessage;
+
+class NativeWinConsoleWriter extends AbstractWindowsConsoleWriter {
+
+    private final java.lang.foreign.MemorySegment console = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    @Override
+    protected void writeConsole(char[] text, int len) throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment txt = arena.allocateFrom(ValueLayout.JAVA_CHAR, text);
+            if (WriteConsoleW(console, txt, len, MemorySegment.NULL, MemorySegment.NULL) == 0) {
+                throw new IOException("Failed to write to console: " + getLastErrorMessage());
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
new file mode 100644
index 0000000000000..189fc2808d904
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.BufferedWriter;
+import java.io.IOError;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.util.function.Function;
+import java.util.function.IntConsumer;
+
+import jdk.internal.org.jline.terminal.Cursor;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.utils.OSUtils;
+
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.*;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetConsoleMode;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetConsoleScreenBufferInfo;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetStdHandle;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.INPUT_RECORD;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.INVALID_HANDLE_VALUE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.KEY_EVENT_RECORD;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.MOUSE_EVENT_RECORD;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_ERROR_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_INPUT_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_OUTPUT_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SetConsoleMode;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.WaitForSingleObject;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.getLastErrorMessage;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.readConsoleInputHelper;
+
+public class NativeWinSysTerminal extends AbstractWindowsTerminal<java.lang.foreign.MemorySegment> {
+
+    public static NativeWinSysTerminal createTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            SignalHandler signalHandler,
+            boolean paused,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            // Get input console mode
+            java.lang.foreign.MemorySegment consoleIn = GetStdHandle(STD_INPUT_HANDLE);
+            java.lang.foreign.MemorySegment inMode = allocateInt(arena);
+            if (GetConsoleMode(consoleIn, inMode) == 0) {
+                throw new IOException("Failed to get console mode: " + getLastErrorMessage());
+            }
+            // Get output console and mode
+            java.lang.foreign.MemorySegment console;
+            switch (systemStream) {
+                case Output:
+                    console = GetStdHandle(STD_OUTPUT_HANDLE);
+                    break;
+                case Error:
+                    console = GetStdHandle(STD_ERROR_HANDLE);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
+            }
+            java.lang.foreign.MemorySegment outMode = allocateInt(arena);
+            if (GetConsoleMode(console, outMode) == 0) {
+                throw new IOException("Failed to get console mode: " + getLastErrorMessage());
+            }
+            // Create writer
+            Writer writer;
+            if (ansiPassThrough) {
+                type = type != null ? type : OSUtils.IS_CONEMU ? TYPE_WINDOWS_CONEMU : TYPE_WINDOWS;
+                writer = new NativeWinConsoleWriter();
+            } else {
+                int m = inMode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0);
+                if (enableVtp(console, m)) {
+                    type = type != null ? type : TYPE_WINDOWS_VTP;
+                    writer = new NativeWinConsoleWriter();
+                } else if (OSUtils.IS_CONEMU) {
+                    type = type != null ? type : TYPE_WINDOWS_CONEMU;
+                    writer = new NativeWinConsoleWriter();
+                } else {
+                    type = type != null ? type : TYPE_WINDOWS;
+                    writer = new WindowsAnsiWriter(new BufferedWriter(new NativeWinConsoleWriter()));
+                }
+            }
+            // Create terminal
+            NativeWinSysTerminal terminal = new NativeWinSysTerminal(
+                    provider,
+                    systemStream,
+                    writer,
+                    name,
+                    type,
+                    encoding,
+                    nativeSignals,
+                    signalHandler,
+                    consoleIn,
+                    inMode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0),
+                    console,
+                    outMode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0),
+                    inputStreamWrapper);
+            // Start input pump thread
+            if (!paused) {
+                terminal.resume();
+            }
+            return terminal;
+        }
+    }
+
+    private static boolean enableVtp(java.lang.foreign.MemorySegment console, int m) {
+        return SetConsoleMode(console, m | AbstractWindowsTerminal.ENABLE_VIRTUAL_TERMINAL_PROCESSING) != 0;
+    }
+
+    public static boolean isWindowsSystemStream(SystemStream stream) {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment console;
+            java.lang.foreign.MemorySegment mode = allocateInt(arena);
+            switch (stream) {
+                case Input:
+                    console = GetStdHandle(STD_INPUT_HANDLE);
+                    break;
+                case Output:
+                    console = GetStdHandle(STD_OUTPUT_HANDLE);
+                    break;
+                case Error:
+                    console = GetStdHandle(STD_ERROR_HANDLE);
+                    break;
+                default:
+                    return false;
+            }
+            return GetConsoleMode(console, mode) != 0;
+        }
+    }
+
+    private static java.lang.foreign.MemorySegment allocateInt(java.lang.foreign.Arena arena) {
+        return arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT);
+    }
+
+    NativeWinSysTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            Writer writer,
+            String name,
+            String type,
+            Charset encoding,
+            boolean nativeSignals,
+            SignalHandler signalHandler,
+            java.lang.foreign.MemorySegment inConsole,
+            int inConsoleMode,
+            java.lang.foreign.MemorySegment outConsole,
+            int outConsoleMode,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        super(
+                provider,
+                systemStream,
+                writer,
+                name,
+                type,
+                encoding,
+                nativeSignals,
+                signalHandler,
+                inConsole,
+                inConsoleMode,
+                outConsole,
+                outConsoleMode,
+                inputStreamWrapper);
+    }
+
+    @Override
+    protected int getConsoleMode(java.lang.foreign.MemorySegment console) {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment mode = arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT);
+            if (GetConsoleMode(console, mode) == 0) {
+                return -1;
+            }
+            return mode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0);
+        }
+    }
+
+    @Override
+    protected void setConsoleMode(java.lang.foreign.MemorySegment console, int mode) {
+        SetConsoleMode(console, mode);
+    }
+
+    public Size getSize() {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO(arena);
+            GetConsoleScreenBufferInfo(outConsole, info);
+            return new Size(info.windowWidth(), info.windowHeight());
+        }
+    }
+
+    @Override
+    public Size getBufferSize() {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO(arena);
+            GetConsoleScreenBufferInfo(outConsole, info);
+            return new Size(info.size().x(), info.size().y());
+        }
+    }
+
+    protected boolean processConsoleInput() throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            INPUT_RECORD[] events;
+            if (inConsole != null
+                    && inConsole.address() != INVALID_HANDLE_VALUE
+                    && WaitForSingleObject(inConsole, 100) == 0) {
+                events = readConsoleInputHelper(arena, inConsole, 1, false);
+            } else {
+                return false;
+            }
+
+            boolean flush = false;
+            for (INPUT_RECORD event : events) {
+                int eventType = event.eventType();
+                if (eventType == KEY_EVENT) {
+                    KEY_EVENT_RECORD keyEvent = event.keyEvent();
+                    processKeyEvent(
+                            keyEvent.keyDown(), keyEvent.keyCode(), keyEvent.uchar(), keyEvent.controlKeyState());
+                    flush = true;
+                } else if (eventType == WINDOW_BUFFER_SIZE_EVENT) {
+                    raise(Signal.WINCH);
+                } else if (eventType == MOUSE_EVENT) {
+                    processMouseEvent(event.mouseEvent());
+                    flush = true;
+                } else if (eventType == FOCUS_EVENT) {
+                    processFocusEvent(event.focusEvent().setFocus());
+                }
+            }
+
+            return flush;
+        }
+    }
+
+    private final char[] focus = new char[] {'\033', '[', ' '};
+
+    private void processFocusEvent(boolean hasFocus) throws IOException {
+        if (focusTracking) {
+            focus[2] = hasFocus ? 'I' : 'O';
+            slaveInputPipe.write(focus);
+        }
+    }
+
+    private final char[] mouse = new char[] {'\033', '[', 'M', ' ', ' ', ' '};
+
+    private void processMouseEvent(MOUSE_EVENT_RECORD mouseEvent) throws IOException {
+        int dwEventFlags = mouseEvent.eventFlags();
+        int dwButtonState = mouseEvent.buttonState();
+        if (tracking == MouseTracking.Off
+                || tracking == MouseTracking.Normal && dwEventFlags == MOUSE_MOVED
+                || tracking == MouseTracking.Button && dwEventFlags == MOUSE_MOVED && dwButtonState == 0) {
+            return;
+        }
+        int cb = 0;
+        dwEventFlags &= ~DOUBLE_CLICK; // Treat double-clicks as normal
+        if (dwEventFlags == MOUSE_WHEELED) {
+            cb |= 64;
+            if ((dwButtonState >> 16) < 0) {
+                cb |= 1;
+            }
+        } else if (dwEventFlags == MOUSE_HWHEELED) {
+            return;
+        } else if ((dwButtonState & FROM_LEFT_1ST_BUTTON_PRESSED) != 0) {
+            cb |= 0x00;
+        } else if ((dwButtonState & RIGHTMOST_BUTTON_PRESSED) != 0) {
+            cb |= 0x01;
+        } else if ((dwButtonState & FROM_LEFT_2ND_BUTTON_PRESSED) != 0) {
+            cb |= 0x02;
+        } else {
+            cb |= 0x03;
+        }
+        int cx = mouseEvent.mousePosition().x();
+        int cy = mouseEvent.mousePosition().y();
+        mouse[3] = (char) (' ' + cb);
+        mouse[4] = (char) (' ' + cx + 1);
+        mouse[5] = (char) (' ' + cy + 1);
+        slaveInputPipe.write(mouse);
+    }
+
+    @Override
+    public Cursor getCursorPosition(IntConsumer discarded) {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO(arena);
+            if (GetConsoleScreenBufferInfo(outConsole, info) == 0) {
+                throw new IOError(new IOException("Could not get the cursor position: " + getLastErrorMessage()));
+            }
+            return new Cursor(info.cursorPosition().x(), info.cursorPosition().y());
+        }
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/WindowsAnsiWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/WindowsAnsiWriter.java
new file mode 100644
index 0000000000000..6330e975952ce
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/WindowsAnsiWriter.java
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import jdk.internal.org.jline.utils.AnsiWriter;
+import jdk.internal.org.jline.utils.Colors;
+
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.BACKGROUND_BLUE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.BACKGROUND_GREEN;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.BACKGROUND_INTENSITY;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.BACKGROUND_RED;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.CHAR_INFO;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.CONSOLE_SCREEN_BUFFER_INFO;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.COORD;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FOREGROUND_BLUE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FOREGROUND_GREEN;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FOREGROUND_INTENSITY;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FOREGROUND_RED;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FillConsoleOutputAttribute;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FillConsoleOutputCharacterW;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetConsoleScreenBufferInfo;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetStdHandle;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SMALL_RECT;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_OUTPUT_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.ScrollConsoleScreenBuffer;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SetConsoleCursorPosition;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SetConsoleTextAttribute;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SetConsoleTitleW;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.getLastErrorMessage;
+
+class WindowsAnsiWriter extends AnsiWriter {
+
+    private static final java.lang.foreign.MemorySegment console = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    private static final short FOREGROUND_BLACK = 0;
+    private static final short FOREGROUND_YELLOW = (short) (FOREGROUND_RED | FOREGROUND_GREEN);
+    private static final short FOREGROUND_MAGENTA = (short) (FOREGROUND_BLUE | FOREGROUND_RED);
+    private static final short FOREGROUND_CYAN = (short) (FOREGROUND_BLUE | FOREGROUND_GREEN);
+    private static final short FOREGROUND_WHITE = (short) (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
+
+    private static final short BACKGROUND_BLACK = 0;
+    private static final short BACKGROUND_YELLOW = (short) (BACKGROUND_RED | BACKGROUND_GREEN);
+    private static final short BACKGROUND_MAGENTA = (short) (BACKGROUND_BLUE | BACKGROUND_RED);
+    private static final short BACKGROUND_CYAN = (short) (BACKGROUND_BLUE | BACKGROUND_GREEN);
+    private static final short BACKGROUND_WHITE = (short) (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE);
+
+    private static final short[] ANSI_FOREGROUND_COLOR_MAP = {
+        FOREGROUND_BLACK,
+        FOREGROUND_RED,
+        FOREGROUND_GREEN,
+        FOREGROUND_YELLOW,
+        FOREGROUND_BLUE,
+        FOREGROUND_MAGENTA,
+        FOREGROUND_CYAN,
+        FOREGROUND_WHITE,
+    };
+
+    private static final short[] ANSI_BACKGROUND_COLOR_MAP = {
+        BACKGROUND_BLACK,
+        BACKGROUND_RED,
+        BACKGROUND_GREEN,
+        BACKGROUND_YELLOW,
+        BACKGROUND_BLUE,
+        BACKGROUND_MAGENTA,
+        BACKGROUND_CYAN,
+        BACKGROUND_WHITE,
+    };
+
+    private final CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO(java.lang.foreign.Arena.ofAuto());
+    private final short originalColors;
+
+    private boolean negative;
+    private boolean bold;
+    private boolean underline;
+    private short savedX = -1;
+    private short savedY = -1;
+
+    public WindowsAnsiWriter(Writer out) throws IOException {
+        super(out);
+        getConsoleInfo();
+        originalColors = info.attributes();
+    }
+
+    private void getConsoleInfo() throws IOException {
+        out.flush();
+        if (GetConsoleScreenBufferInfo(console, info) == 0) {
+            throw new IOException("Could not get the screen info: " + getLastErrorMessage());
+        }
+        if (negative) {
+            info.attributes(invertAttributeColors(info.attributes()));
+        }
+    }
+
+    private void applyAttribute() throws IOException {
+        out.flush();
+        short attributes = info.attributes();
+        // bold is simulated by high foreground intensity
+        if (bold) {
+            attributes |= FOREGROUND_INTENSITY;
+        }
+        // underline is simulated by high foreground intensity
+        if (underline) {
+            attributes |= BACKGROUND_INTENSITY;
+        }
+        if (negative) {
+            attributes = invertAttributeColors(attributes);
+        }
+        if (SetConsoleTextAttribute(console, attributes) == 0) {
+            throw new IOException(getLastErrorMessage());
+        }
+    }
+
+    private short invertAttributeColors(short attributes) {
+        // Swap the the Foreground and Background bits.
+        int fg = 0x000F & attributes;
+        fg <<= 4;
+        int bg = 0X00F0 & attributes;
+        bg >>= 4;
+        attributes = (short) ((attributes & 0xFF00) | fg | bg);
+        return attributes;
+    }
+
+    private void applyCursorPosition() throws IOException {
+        info.cursorPosition().x((short)
+                Math.max(0, Math.min(info.size().x() - 1, info.cursorPosition().x())));
+        info.cursorPosition().y((short)
+                Math.max(0, Math.min(info.size().y() - 1, info.cursorPosition().y())));
+        if (SetConsoleCursorPosition(console, info.cursorPosition()) == 0) {
+            throw new IOException(getLastErrorMessage());
+        }
+    }
+
+    @Override
+    protected void processEraseScreen(int eraseOption) throws IOException {
+        getConsoleInfo();
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment written = arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT);
+            switch (eraseOption) {
+                case ERASE_SCREEN -> {
+                    COORD topLeft = new COORD(arena, (short) 0, info.window().top());
+                    int screenLength = info.window().height() * info.size().x();
+                    FillConsoleOutputAttribute(console, originalColors, screenLength, topLeft, written);
+                    FillConsoleOutputCharacterW(console, ' ', screenLength, topLeft, written);
+                }
+                case ERASE_SCREEN_TO_BEGINING -> {
+                    COORD topLeft2 = new COORD(arena, (short) 0, info.window().top());
+                    int lengthToCursor =
+                            (info.cursorPosition().y() - info.window().top())
+                                            * info.size().x()
+                                    + info.cursorPosition().x();
+                    FillConsoleOutputAttribute(console, originalColors, lengthToCursor, topLeft2, written);
+                    FillConsoleOutputCharacterW(console, ' ', lengthToCursor, topLeft2, written);
+                }
+                case ERASE_SCREEN_TO_END -> {
+                    int lengthToEnd =
+                            (info.window().bottom() - info.cursorPosition().y())
+                                            * info.size().x()
+                                    + (info.size().x() - info.cursorPosition().x());
+                    FillConsoleOutputAttribute(console, originalColors, lengthToEnd, info.cursorPosition(), written);
+                    FillConsoleOutputCharacterW(console, ' ', lengthToEnd, info.cursorPosition(), written);
+                }
+                default -> {}
+            }
+        }
+    }
+
+    @Override
+    protected void processEraseLine(int eraseOption) throws IOException {
+        getConsoleInfo();
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment written = arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT);
+            switch (eraseOption) {
+                case ERASE_LINE -> {
+                    COORD leftColCurrRow =
+                            new COORD(arena, (short) 0, info.cursorPosition().y());
+                    FillConsoleOutputAttribute(
+                            console, originalColors, info.size().x(), leftColCurrRow, written);
+                    FillConsoleOutputCharacterW(console, ' ', info.size().x(), leftColCurrRow, written);
+                }
+                case ERASE_LINE_TO_BEGINING -> {
+                    COORD leftColCurrRow2 =
+                            new COORD(arena, (short) 0, info.cursorPosition().y());
+                    FillConsoleOutputAttribute(
+                            console, originalColors, info.cursorPosition().x(), leftColCurrRow2, written);
+                    FillConsoleOutputCharacterW(
+                            console, ' ', info.cursorPosition().x(), leftColCurrRow2, written);
+                }
+                case ERASE_LINE_TO_END -> {
+                    int lengthToLastCol =
+                            info.size().x() - info.cursorPosition().x();
+                    FillConsoleOutputAttribute(
+                            console, originalColors, lengthToLastCol, info.cursorPosition(), written);
+                    FillConsoleOutputCharacterW(console, ' ', lengthToLastCol, info.cursorPosition(), written);
+                }
+                default -> {}
+            }
+        }
+    }
+
+    protected void processCursorUpLine(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) 0);
+        info.cursorPosition().y((short) (info.cursorPosition().y() - count));
+        applyCursorPosition();
+    }
+
+    protected void processCursorDownLine(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) 0);
+        info.cursorPosition().y((short) (info.cursorPosition().y() + count));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorLeft(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) (info.cursorPosition().x() - count));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorRight(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) (info.cursorPosition().x() + count));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorDown(int count) throws IOException {
+        getConsoleInfo();
+        int nb = Math.max(0, info.cursorPosition().y() + count - info.size().y() + 1);
+        if (nb != count) {
+            info.cursorPosition().y((short) (info.cursorPosition().y() + count));
+            applyCursorPosition();
+        }
+        if (nb > 0) {
+            try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+                SMALL_RECT scroll = new SMALL_RECT(arena, info.window());
+                scroll.top((short) 0);
+                COORD org = new COORD(arena);
+                org.x((short) 0);
+                org.y((short) (-nb));
+                CHAR_INFO info = new CHAR_INFO(arena, ' ', originalColors);
+                ScrollConsoleScreenBuffer(console, scroll, scroll, org, info);
+            }
+        }
+    }
+
+    @Override
+    protected void processCursorUp(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().y((short) (info.cursorPosition().y() - count));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorTo(int row, int col) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().y((short) (info.window().top() + row - 1));
+        info.cursorPosition().x((short) (col - 1));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorToColumn(int x) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) (x - 1));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processSetForegroundColorExt(int paletteIndex) throws IOException {
+        int color = Colors.roundColor(paletteIndex, 16);
+        info.attributes((short) ((info.attributes() & ~0x0007) | ANSI_FOREGROUND_COLOR_MAP[color & 0x07]));
+        info.attributes(
+                (short) ((info.attributes() & ~FOREGROUND_INTENSITY) | (color >= 8 ? FOREGROUND_INTENSITY : 0)));
+        applyAttribute();
+    }
+
+    @Override
+    protected void processSetBackgroundColorExt(int paletteIndex) throws IOException {
+        int color = Colors.roundColor(paletteIndex, 16);
+        info.attributes((short) ((info.attributes() & ~0x0070) | ANSI_BACKGROUND_COLOR_MAP[color & 0x07]));
+        info.attributes(
+                (short) ((info.attributes() & ~BACKGROUND_INTENSITY) | (color >= 8 ? BACKGROUND_INTENSITY : 0)));
+        applyAttribute();
+    }
+
+    @Override
+    protected void processDefaultTextColor() throws IOException {
+        info.attributes((short) ((info.attributes() & ~0x000F) | (originalColors & 0xF)));
+        info.attributes((short) (info.attributes() & ~FOREGROUND_INTENSITY));
+        applyAttribute();
+    }
+
+    @Override
+    protected void processDefaultBackgroundColor() throws IOException {
+        info.attributes((short) ((info.attributes() & ~0x00F0) | (originalColors & 0xF0)));
+        info.attributes((short) (info.attributes() & ~BACKGROUND_INTENSITY));
+        applyAttribute();
+    }
+
+    @Override
+    protected void processAttributeRest() throws IOException {
+        info.attributes((short) ((info.attributes() & ~0x00FF) | originalColors));
+        this.negative = false;
+        this.bold = false;
+        this.underline = false;
+        applyAttribute();
+    }
+
+    @Override
+    protected void processSetAttribute(int attribute) throws IOException {
+        switch (attribute) {
+            case ATTRIBUTE_INTENSITY_BOLD -> {
+                bold = true;
+                applyAttribute();
+            }
+            case ATTRIBUTE_INTENSITY_NORMAL -> {
+                bold = false;
+                applyAttribute();
+            }
+            case ATTRIBUTE_UNDERLINE -> {
+                underline = true;
+                applyAttribute();
+            }
+            case ATTRIBUTE_UNDERLINE_OFF -> {
+                underline = false;
+                applyAttribute();
+            }
+            case ATTRIBUTE_NEGATIVE_ON -> {
+                negative = true;
+                applyAttribute();
+            }
+            case ATTRIBUTE_NEGATIVE_OFF -> {
+                negative = false;
+                applyAttribute();
+            }
+            default -> {}
+        }
+    }
+
+    @Override
+    protected void processSaveCursorPosition() throws IOException {
+        getConsoleInfo();
+        savedX = info.cursorPosition().x();
+        savedY = info.cursorPosition().y();
+    }
+
+    @Override
+    protected void processRestoreCursorPosition() throws IOException {
+        // restore only if there was a save operation first
+        if (savedX != -1 && savedY != -1) {
+            out.flush();
+            info.cursorPosition().x(savedX);
+            info.cursorPosition().y(savedY);
+            applyCursorPosition();
+        }
+    }
+
+    @Override
+    protected void processInsertLine(int optionInt) throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            getConsoleInfo();
+            SMALL_RECT scroll = info.window().copy(arena);
+            scroll.top(info.cursorPosition().y());
+            COORD org =
+                    new COORD(arena, (short) 0, (short) (info.cursorPosition().y() + optionInt));
+            CHAR_INFO info = new CHAR_INFO(arena, ' ', originalColors);
+            if (ScrollConsoleScreenBuffer(console, scroll, scroll, org, info) == 0) {
+                throw new IOException(getLastErrorMessage());
+            }
+        }
+    }
+
+    @Override
+    protected void processDeleteLine(int optionInt) throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            getConsoleInfo();
+            SMALL_RECT scroll = info.window().copy(arena);
+            scroll.top(info.cursorPosition().y());
+            COORD org =
+                    new COORD(arena, (short) 0, (short) (info.cursorPosition().y() - optionInt));
+            CHAR_INFO info = new CHAR_INFO(arena, ' ', originalColors);
+            if (ScrollConsoleScreenBuffer(console, scroll, scroll, org, info) == 0) {
+                throw new IOException(getLastErrorMessage());
+            }
+        }
+    }
+
+    @Override
+    protected void processChangeWindowTitle(String title) {
+        try (java.lang.foreign.Arena session = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment str = session.allocateFrom(title);
+            SetConsoleTitleW(str);
+        }
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/jna/LastErrorException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/jna/LastErrorException.java
deleted file mode 100644
index 63795664dfc62..0000000000000
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/jna/LastErrorException.java
+++ /dev/null
@@ -1,36 +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.internal.org.jline.terminal.impl.jna;
-
-@SuppressWarnings("serial")
-public class LastErrorException extends RuntimeException{
-
-    public final long lastError;
-
-    public LastErrorException(long lastError) {
-        this.lastError = lastError;
-    }
-
-}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/Pty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/Pty.java
index b1e22056702ca..d72e0e669d102 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/Pty.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/Pty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -34,4 +34,7 @@ public interface Pty extends Closeable {
 
     void setSize(Size size) throws IOException;
 
+    SystemStream getSystemStream();
+
+    TerminalProvider getProvider();
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/SystemStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/SystemStream.java
new file mode 100644
index 0000000000000..5f95024829556
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/SystemStream.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.spi;
+
+public enum SystemStream {
+    Input,
+    Output,
+    Error
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalExt.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalExt.java
new file mode 100644
index 0000000000000..00cfb2e9d475e
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalExt.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.spi;
+
+import jdk.internal.org.jline.terminal.Terminal;
+
+/**
+ * The {@code TerminalExt} interface is implemented by {@code Terminal}s
+ * and provides access to the Terminal's internals.
+ */
+public interface TerminalExt extends Terminal {
+
+    /**
+     * Returns the {@code TerminalProvider} that created this terminal
+     * or {@code null} if the terminal was created with no provider.
+     */
+    TerminalProvider getProvider();
+
+    /**
+     * The underlying system stream, may be {@link SystemStream#Output},
+     * {@link SystemStream#Error}, or {@code null} if this terminal is not bound
+     * to a system stream.
+     */
+    SystemStream getSystemStream();
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalProvider.java
index 69f353c571905..055bf224fc516 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalProvider.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, the original author or authors.
+ * Copyright (c) 2022, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -11,58 +11,60 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Properties;
-import java.util.ServiceLoader;
 import java.util.function.Function;
 
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
 import jdk.internal.org.jline.terminal.impl.exec.ExecTerminalProvider;
+import jdk.internal.org.jline.terminal.impl.ffm.FfmTerminalProvider;
 
-public interface TerminalProvider
-{
-
-    enum Stream {
-        Input,
-        Output,
-        Error
-    }
+public interface TerminalProvider {
 
     String name();
 
-    Terminal sysTerminal(String name, String type, boolean ansiPassThrough,
-                         Charset encoding, boolean nativeSignals,
-                         Terminal.SignalHandler signalHandler, boolean paused,
-                         Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException;
+    Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException;
+
+    Terminal newTerminal(
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException;
 
-    Terminal newTerminal(String name, String type,
-                         InputStream masterInput, OutputStream masterOutput,
-                         Charset encoding, Terminal.SignalHandler signalHandler,
-                         boolean paused, Attributes attributes, Size size) throws IOException;
+    boolean isSystemStream(SystemStream stream);
 
-    boolean isSystemStream(Stream stream);
+    String systemStreamName(SystemStream stream);
 
-    String systemStreamName(Stream stream);
+    int systemStreamWidth(SystemStream stream);
 
     static TerminalProvider load(String name) throws IOException {
         switch (name) {
             case "exec": return new ExecTerminalProvider();
-            case "jna": {
-                try {
-                    return (TerminalProvider) Class.forName("jdk.internal.org.jline.terminal.impl.jna.JnaTerminalProvider").getConstructor().newInstance();
-                } catch (ReflectiveOperationException t) {
-                    throw new IOException(t);
-                }
-            }
+            case "ffm": return new FfmTerminalProvider();
         }
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         if (cl == null) {
             cl = ClassLoader.getSystemClassLoader();
         }
-        InputStream is = cl.getResourceAsStream( "META-INF/services/org/jline/terminal/provider/" + name);
+        InputStream is = cl.getResourceAsStream("META-INF/services/org/jline/terminal/provider/" + name);
         if (is != null) {
             Properties props = new Properties();
             try {
@@ -71,14 +73,13 @@ static TerminalProvider load(String name) throws IOException {
                 if (className == null) {
                     throw new IOException("No class defined in terminal provider file " + name);
                 }
-                Class<?> clazz = cl.loadClass( className );
+                Class<?> clazz = cl.loadClass(className);
                 return (TerminalProvider) clazz.getConstructor().newInstance();
-            } catch ( Exception e ) {
-                throw new IOException("Unable to load terminal provider " + name, e);
+            } catch (Exception e) {
+                throw new IOException("Unable to load terminal provider " + name + ": " + e.getMessage(), e);
             }
         } else {
             throw new IOException("Unable to find terminal provider " + name);
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java
index 081665a2d4693..32d8282d4c0b7 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java
@@ -1,17 +1,10 @@
 /*
- * Copyright (C) 2009-2018 the original author(s).
+ * Copyright (c) 2009-2018, the original author(s).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package jdk.internal.org.jline.utils;
 
@@ -252,12 +245,10 @@ private void reset(boolean skipBuffer) throws IOException {
      * @throws IOException      if no more non-null values left
      */
     private int getNextOptionInt(Iterator<Object> optionsIterator) throws IOException {
-        for (;;) {
-            if (!optionsIterator.hasNext())
-                throw new IllegalArgumentException();
+        for (; ; ) {
+            if (!optionsIterator.hasNext()) throw new IllegalArgumentException();
             Object arg = optionsIterator.next();
-            if (arg != null)
-                return (Integer) arg;
+            if (arg != null) return (Integer) arg;
         }
     }
 
@@ -346,27 +337,21 @@ private boolean processEscapeCommand(ArrayList<Object> options, int command) thr
                                     int g = getNextOptionInt(optionsIterator);
                                     int b = getNextOptionInt(optionsIterator);
                                     if (r >= 0 && r <= 255 && g >= 0 && g <= 255 && b >= 0 && b <= 255) {
-                                        if (value == 38)
-                                            processSetForegroundColorExt(r, g, b);
-                                        else
-                                            processSetBackgroundColorExt(r, g, b);
+                                        if (value == 38) processSetForegroundColorExt(r, g, b);
+                                        else processSetBackgroundColorExt(r, g, b);
                                     } else {
                                         throw new IllegalArgumentException();
                                     }
-                                }
-                                else if (arg2or5 == 5) {
+                                } else if (arg2or5 == 5) {
                                     // 256 color style like `esc[38;5;<index>m`
                                     int paletteIndex = getNextOptionInt(optionsIterator);
                                     if (paletteIndex >= 0 && paletteIndex <= 255) {
-                                        if (value == 38)
-                                            processSetForegroundColorExt(paletteIndex);
-                                        else
-                                            processSetBackgroundColorExt(paletteIndex);
+                                        if (value == 38) processSetForegroundColorExt(paletteIndex);
+                                        else processSetBackgroundColorExt(paletteIndex);
                                     } else {
                                         throw new IllegalArgumentException();
                                     }
-                                }
-                                else {
+                                } else {
                                     throw new IllegalArgumentException();
                                 }
                             } else {
@@ -449,47 +434,41 @@ private boolean processOperatingSystemCommand(ArrayList<Object> options) throws
      * Process <code>CSI u</code> ANSI code, corresponding to <code>RCP \u2013 Restore Cursor Position</code>
      * @throws IOException if an error occurs
      */
-    protected void processRestoreCursorPosition() throws IOException {
-    }
+    protected void processRestoreCursorPosition() throws IOException {}
 
     /**
      * Process <code>CSI s</code> ANSI code, corresponding to <code>SCP \u2013 Save Cursor Position</code>
      * @throws IOException if an error occurs
      */
-    protected void processSaveCursorPosition() throws IOException {
-    }
+    protected void processSaveCursorPosition() throws IOException {}
 
     /**
      * Process <code>CSI s</code> ANSI code, corresponding to <code>IL \u2013 Insert Line</code>
      * @param optionInt the option
      * @throws IOException if an error occurs
      */
-    protected void processInsertLine(int optionInt) throws IOException {
-    }
+    protected void processInsertLine(int optionInt) throws IOException {}
 
     /**
      * Process <code>CSI s</code> ANSI code, corresponding to <code>DL \u2013 Delete Line</code>
      * @param optionInt the option
      * @throws IOException if an error occurs
      */
-    protected void processDeleteLine(int optionInt) throws IOException {
-    }
+    protected void processDeleteLine(int optionInt) throws IOException {}
 
     /**
      * Process <code>CSI n T</code> ANSI code, corresponding to <code>SD \u2013 Scroll Down</code>
      * @param optionInt the option
      * @throws IOException if an error occurs
      */
-    protected void processScrollDown(int optionInt) throws IOException {
-    }
+    protected void processScrollDown(int optionInt) throws IOException {}
 
     /**
      * Process <code>CSI n U</code> ANSI code, corresponding to <code>SU \u2013 Scroll Up</code>
      * @param optionInt the option
      * @throws IOException if an error occurs
      */
-    protected void processScrollUp(int optionInt) throws IOException {
-    }
+    protected void processScrollUp(int optionInt) throws IOException {}
 
     protected static final int ERASE_SCREEN_TO_END = 0;
     protected static final int ERASE_SCREEN_TO_BEGINING = 1;
@@ -500,8 +479,7 @@ protected void processScrollUp(int optionInt) throws IOException {
      * @param eraseOption the erase option
      * @throws IOException if an error occurs
      */
-    protected void processEraseScreen(int eraseOption) throws IOException {
-    }
+    protected void processEraseScreen(int eraseOption) throws IOException {}
 
     protected static final int ERASE_LINE_TO_END = 0;
     protected static final int ERASE_LINE_TO_BEGINING = 1;
@@ -512,25 +490,27 @@ protected void processEraseScreen(int eraseOption) throws IOException {
      * @param eraseOption the erase option
      * @throws IOException if an error occurs
      */
-    protected void processEraseLine(int eraseOption) throws IOException {
-    }
+    protected void processEraseLine(int eraseOption) throws IOException {}
+
+    protected static final int ATTRIBUTE_INTENSITY_BOLD = 1; //  Intensity: Bold
+    protected static final int ATTRIBUTE_INTENSITY_FAINT = 2; //  Intensity; Faint  not widely supported
+    protected static final int ATTRIBUTE_ITALIC = 3; //  Italic; on  not widely supported. Sometimes treated as inverse.
+    protected static final int ATTRIBUTE_UNDERLINE = 4; //  Underline; Single
+    protected static final int ATTRIBUTE_BLINK_SLOW = 5; //  Blink; Slow  less than 150 per minute
+    protected static final int ATTRIBUTE_BLINK_FAST = 6; //  Blink; Rapid  MS-DOS ANSI.SYS; 150 per minute or more
+    protected static final int ATTRIBUTE_NEGATIVE_ON =
+            7; //  Image; Negative  inverse or reverse; swap foreground and background
+    protected static final int ATTRIBUTE_CONCEAL_ON = 8; //  Conceal on
+    protected static final int ATTRIBUTE_UNDERLINE_DOUBLE = 21; //  Underline; Double  not widely supported
+    protected static final int ATTRIBUTE_INTENSITY_NORMAL = 22; //  Intensity; Normal  not bold and not faint
+    protected static final int ATTRIBUTE_UNDERLINE_OFF = 24; //  Underline; None
+    protected static final int ATTRIBUTE_BLINK_OFF = 25; //  Blink; off
 
-    protected static final int ATTRIBUTE_INTENSITY_BOLD = 1; //         Intensity: Bold
-    protected static final int ATTRIBUTE_INTENSITY_FAINT = 2; //        Intensity; Faint        not widely supported
-    protected static final int ATTRIBUTE_ITALIC = 3; //         Italic; on      not widely supported. Sometimes treated as inverse.
-    protected static final int ATTRIBUTE_UNDERLINE = 4; //      Underline; Single
-    protected static final int ATTRIBUTE_BLINK_SLOW = 5; //     Blink; Slow     less than 150 per minute
-    protected static final int ATTRIBUTE_BLINK_FAST = 6; //     Blink; Rapid    MS-DOS ANSI.SYS; 150 per minute or more
-    protected static final int ATTRIBUTE_NEGATIVE_ON = 7; //    Image; Negative         inverse or reverse; swap foreground and background
-    protected static final int ATTRIBUTE_CONCEAL_ON = 8; //     Conceal on
-    protected static final int ATTRIBUTE_UNDERLINE_DOUBLE = 21; //      Underline; Double       not widely supported
-    protected static final int ATTRIBUTE_INTENSITY_NORMAL = 22; //      Intensity; Normal       not bold and not faint
-    protected static final int ATTRIBUTE_UNDERLINE_OFF = 24; //         Underline; None
-    protected static final int ATTRIBUTE_BLINK_OFF = 25; //     Blink; off
     @Deprecated
     protected static final int ATTRIBUTE_NEGATIVE_Off = 27; //  Image; Positive
+
     protected static final int ATTRIBUTE_NEGATIVE_OFF = 27; //  Image; Positive
-    protected static final int ATTRIBUTE_CONCEAL_OFF = 28; //   Reveal  conceal off
+    protected static final int ATTRIBUTE_CONCEAL_OFF = 28; //  Reveal  conceal off
 
     /**
      * process <code>SGR</code> other than <code>0</code> (reset), <code>30-39</code> (foreground),
@@ -546,8 +526,7 @@ protected void processEraseLine(int eraseOption) throws IOException {
      * @see #processDefaultTextColor()
      * @see #processDefaultBackgroundColor()
      */
-    protected void processSetAttribute(int attribute) throws IOException {
-    }
+    protected void processSetAttribute(int attribute) throws IOException {}
 
     protected static final int BLACK = 0;
     protected static final int RED = 1;
@@ -584,8 +563,7 @@ protected void processSetForegroundColor(int color, boolean bright) throws IOExc
      * @param paletteIndex the text color in the palette
      * @throws IOException if an error occurs
      */
-    protected void processSetForegroundColorExt(int paletteIndex) throws IOException {
-    }
+    protected void processSetForegroundColorExt(int paletteIndex) throws IOException {}
 
     /**
      * process <code>SGR 38</code> corresponding to <code>extended set text color (foreground)</code>
@@ -625,8 +603,7 @@ protected void processSetBackgroundColor(int color, boolean bright) throws IOExc
      * @param paletteIndex the background color in the palette
      * @throws IOException if an error occurs
      */
-    protected void processSetBackgroundColorExt(int paletteIndex) throws IOException {
-    }
+    protected void processSetBackgroundColorExt(int paletteIndex) throws IOException {}
 
     /**
      * process <code>SGR 48</code> corresponding to <code>extended set background color</code>
@@ -644,22 +621,19 @@ protected void processSetBackgroundColorExt(int r, int g, int b) throws IOExcept
      * process <code>SGR 39</code> corresponding to <code>Default text color (foreground)</code>
      * @throws IOException if an error occurs
      */
-    protected void processDefaultTextColor() throws IOException {
-    }
+    protected void processDefaultTextColor() throws IOException {}
 
     /**
      * process <code>SGR 49</code> corresponding to <code>Default background color</code>
      * @throws IOException if an error occurs
      */
-    protected void processDefaultBackgroundColor() throws IOException {
-    }
+    protected void processDefaultBackgroundColor() throws IOException {}
 
     /**
      * process <code>SGR 0</code> corresponding to <code>Reset / Normal</code>
      * @throws IOException if an error occurs
      */
-    protected void processAttributeRest() throws IOException {
-    }
+    protected void processAttributeRest() throws IOException {}
 
     /**
      * process <code>CSI n ; m H</code> corresponding to <code>CUP \u2013 Cursor Position</code> or
@@ -668,24 +642,21 @@ protected void processAttributeRest() throws IOException {
      * @param col the column
      * @throws IOException if an error occurs
      */
-    protected void processCursorTo(int row, int col) throws IOException {
-    }
+    protected void processCursorTo(int row, int col) throws IOException {}
 
     /**
      * process <code>CSI n G</code> corresponding to <code>CHA \u2013 Cursor Horizontal Absolute</code>
      * @param x the column
      * @throws IOException if an error occurs
      */
-    protected void processCursorToColumn(int x) throws IOException {
-    }
+    protected void processCursorToColumn(int x) throws IOException {}
 
     /**
      * process <code>CSI n F</code> corresponding to <code>CPL \u2013 Cursor Previous Line</code>
      * @param count line count
      * @throws IOException if an error occurs
      */
-    protected void processCursorUpLine(int count) throws IOException {
-    }
+    protected void processCursorUpLine(int count) throws IOException {}
 
     /**
      * process <code>CSI n E</code> corresponding to <code>CNL \u2013 Cursor Next Line</code>
@@ -704,8 +675,7 @@ protected void processCursorDownLine(int count) throws IOException {
      * @param count the count
      * @throws IOException if an error occurs
      */
-    protected void processCursorLeft(int count) throws IOException {
-    }
+    protected void processCursorLeft(int count) throws IOException {}
 
     /**
      * process <code>CSI n C</code> corresponding to <code>CUF \u2013 Cursor Forward</code>
@@ -724,19 +694,16 @@ protected void processCursorRight(int count) throws IOException {
      * @param count the count
      * @throws IOException if an error occurs
      */
-    protected void processCursorDown(int count) throws IOException {
-    }
+    protected void processCursorDown(int count) throws IOException {}
 
     /**
      * process <code>CSI n A</code> corresponding to <code>CUU \u2013 Cursor Up</code>
      * @param count the count
      * @throws IOException if an error occurs
      */
-    protected void processCursorUp(int count) throws IOException {
-    }
+    protected void processCursorUp(int count) throws IOException {}
 
-    protected void processUnknownExtension(ArrayList<Object> options, int command) {
-    }
+    protected void processUnknownExtension(ArrayList<Object> options, int command) {}
 
     /**
      * process <code>OSC 0;text BEL</code> corresponding to <code>Change Window and Icon label</code>
@@ -751,23 +718,20 @@ protected void processChangeIconNameAndWindowTitle(String label) {
      * process <code>OSC 1;text BEL</code> corresponding to <code>Change Icon label</code>
      * @param name the icon name
      */
-    protected void processChangeIconName(String name) {
-    }
+    protected void processChangeIconName(String name) {}
 
     /**
      * process <code>OSC 2;text BEL</code> corresponding to <code>Change Window title</code>
      * @param title the title
      */
-    protected void processChangeWindowTitle(String title) {
-    }
+    protected void processChangeWindowTitle(String title) {}
 
     /**
      * Process unknown <code>OSC</code> command.
      * @param command the command
      * @param param the param
      */
-    protected void processUnknownOperatingSystemCommand(int command, String param) {
-    }
+    protected void processUnknownOperatingSystemCommand(int command, String param) {}
 
     /**
      * Process character set sequence.
@@ -781,17 +745,13 @@ private boolean processCharsetSelect(ArrayList<Object> options) throws IOExcepti
         return true;
     }
 
-    protected void processCharsetSelect(int set, char seq) {
-    }
+    protected void processCharsetSelect(int set, char seq) {}
 
     private int optionInt(ArrayList<Object> options, int index) {
-        if (options.size() <= index)
-            throw new IllegalArgumentException();
+        if (options.size() <= index) throw new IllegalArgumentException();
         Object value = options.get(index);
-        if (value == null)
-            throw new IllegalArgumentException();
-        if (!value.getClass().equals(Integer.class))
-            throw new IllegalArgumentException();
+        if (value == null) throw new IllegalArgumentException();
+        if (!value.getClass().equals(Integer.class)) throw new IllegalArgumentException();
         return (Integer) value;
     }
 
@@ -828,5 +788,4 @@ public void close() throws IOException {
         flush();
         super.close();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedCharSequence.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedCharSequence.java
index ccb0aaf689b86..6386f5bba3901 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedCharSequence.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedCharSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -15,6 +15,7 @@
 import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
 import jdk.internal.org.jline.utils.InfoCmp.Capability;
 
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_DISABLE_ALTERNATE_CHARSET;
 import static jdk.internal.org.jline.utils.AttributedStyle.BG_COLOR;
 import static jdk.internal.org.jline.utils.AttributedStyle.BG_COLOR_EXP;
 import static jdk.internal.org.jline.utils.AttributedStyle.FG_COLOR;
@@ -30,12 +31,11 @@
 import static jdk.internal.org.jline.utils.AttributedStyle.F_FOREGROUND;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_FOREGROUND_IND;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_FOREGROUND_RGB;
+import static jdk.internal.org.jline.utils.AttributedStyle.F_HIDDEN;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_INVERSE;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_ITALIC;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_UNDERLINE;
-import static jdk.internal.org.jline.utils.AttributedStyle.F_HIDDEN;
 import static jdk.internal.org.jline.utils.AttributedStyle.MASK;
-import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_DISABLE_ALTERNATE_CHARSET;
 
 public abstract class AttributedCharSequence implements CharSequence {
 
@@ -120,6 +120,7 @@ public String toAnsi(int colors, ForceMode force, ColorPalette palette, String a
             char c = charAt(i);
             if (altIn != null && altOut != null) {
                 char pc = c;
+                // @spotless:off
                 switch (c) {
                     case '\u2518': c = 'j'; break;
                     case '\u2510': c = 'k'; break;
@@ -133,15 +134,16 @@ public String toAnsi(int colors, ForceMode force, ColorPalette palette, String a
                     case '\u252C': c = 'w'; break;
                     case '\u2502': c = 'x'; break;
                 }
+                // @spotless:on
                 boolean oldalt = alt;
                 alt = c != pc;
                 if (oldalt ^ alt) {
                     sb.append(alt ? altIn : altOut);
                 }
             }
-            long  s = styleCodeAt(i) & ~F_HIDDEN; // The hidden flag does not change the ansi styles
+            long s = styleCodeAt(i) & ~F_HIDDEN; // The hidden flag does not change the ansi styles
             if (style != s) {
-                long  d = (style ^ s) & MASK;
+                long d = (style ^ s) & MASK;
                 long fg = (s & F_FOREGROUND) != 0 ? s & (FG_COLOR | F_FOREGROUND) : 0;
                 long bg = (s & F_BACKGROUND) != 0 ? s & (BG_COLOR | F_BACKGROUND) : 0;
                 if (s == 0) {
@@ -172,16 +174,16 @@ public String toAnsi(int colors, ForceMode force, ColorPalette palette, String a
                         if (fg > 0) {
                             int rounded = -1;
                             if ((fg & F_FOREGROUND_RGB) != 0) {
-                                int r = (int)(fg >> (FG_COLOR_EXP + 16)) & 0xFF;
-                                int g = (int)(fg >> (FG_COLOR_EXP + 8)) & 0xFF;
-                                int b = (int)(fg >> FG_COLOR_EXP) & 0xFF;
+                                int r = (int) (fg >> (FG_COLOR_EXP + 16)) & 0xFF;
+                                int g = (int) (fg >> (FG_COLOR_EXP + 8)) & 0xFF;
+                                int b = (int) (fg >> FG_COLOR_EXP) & 0xFF;
                                 if (colors >= HIGH_COLORS) {
                                     first = attr(sb, "38;2;" + r + ";" + g + ";" + b, first);
                                 } else {
                                     rounded = palette.round(r, g, b);
                                 }
                             } else if ((fg & F_FOREGROUND_IND) != 0) {
-                                rounded = palette.round((int)(fg >> FG_COLOR_EXP) & 0xFF);
+                                rounded = palette.round((int) (fg >> FG_COLOR_EXP) & 0xFF);
                             }
                             if (rounded >= 0) {
                                 if (colors >= HIGH_COLORS && force == ForceMode.ForceTrueColors) {
@@ -211,16 +213,16 @@ public String toAnsi(int colors, ForceMode force, ColorPalette palette, String a
                         if (bg > 0) {
                             int rounded = -1;
                             if ((bg & F_BACKGROUND_RGB) != 0) {
-                                int r = (int)(bg >> (BG_COLOR_EXP + 16)) & 0xFF;
-                                int g = (int)(bg >> (BG_COLOR_EXP + 8)) & 0xFF;
-                                int b = (int)(bg >> BG_COLOR_EXP) & 0xFF;
+                                int r = (int) (bg >> (BG_COLOR_EXP + 16)) & 0xFF;
+                                int g = (int) (bg >> (BG_COLOR_EXP + 8)) & 0xFF;
+                                int b = (int) (bg >> BG_COLOR_EXP) & 0xFF;
                                 if (colors >= HIGH_COLORS) {
                                     first = attr(sb, "48;2;" + r + ";" + g + ";" + b, first);
                                 } else {
                                     rounded = palette.round(r, g, b);
                                 }
                             } else if ((bg & F_BACKGROUND_IND) != 0) {
-                                rounded = palette.round((int)(bg >> BG_COLOR_EXP) & 0xFF);
+                                rounded = palette.round((int) (bg >> BG_COLOR_EXP) & 0xFF);
                             }
                             if (rounded >= 0) {
                                 if (colors >= HIGH_COLORS && force == ForceMode.ForceTrueColors) {
@@ -243,8 +245,7 @@ public String toAnsi(int colors, ForceMode force, ColorPalette palette, String a
                         background = bg;
                     }
                     if ((d & (F_BOLD | F_FAINT)) != 0) {
-                        if (    (d & F_BOLD)  != 0 && (s & F_BOLD)  == 0
-                                || (d & F_FAINT) != 0 && (s & F_FAINT) == 0) {
+                        if ((d & F_BOLD) != 0 && (s & F_BOLD) == 0 || (d & F_FAINT) != 0 && (s & F_FAINT) == 0) {
                             first = attr(sb, "22", first);
                         }
                         if ((d & F_BOLD) != 0 && (s & F_BOLD) != 0) {
@@ -360,8 +361,7 @@ public int columnLength() {
         int len = length();
         for (int cur = 0; cur < len; ) {
             int cp = codePointAt(cur);
-            if (!isHidden(cur))
-                cols += WCWidth.wcwidth(cp);
+            if (!isHidden(cur)) cols += WCWidth.wcwidth(cp);
             cur += Character.charCount(cp);
         }
         return cols;
@@ -382,8 +382,7 @@ public AttributedString columnSubSequence(int start, int stop) {
         int end = begin;
         while (end < this.length()) {
             int cp = codePointAt(end);
-            if (cp == '\n')
-                break;
+            if (cp == '\n') break;
             int w = isHidden(end) ? 0 : WCWidth.wcwidth(cp);
             if (col + w > stop) {
                 break;
@@ -407,7 +406,7 @@ public List<AttributedString> columnSplitLength(int columns, boolean includeNewl
             int cp = codePointAt(cur);
             int w = isHidden(cur) ? 0 : WCWidth.wcwidth(cp);
             if (cp == '\n') {
-                strings.add(subSequence(beg, includeNewlines ? cur+1 : cur));
+                strings.add(subSequence(beg, includeNewlines ? cur + 1 : cur));
                 beg = cur + 1;
                 col = 0;
             } else if ((col += w) > columns) {
@@ -429,5 +428,4 @@ public String toString() {
     public AttributedString toAttributedString() {
         return substring(0, length());
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedString.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedString.java
index 47492b72e7648..3c70a6d0e7bf4 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedString.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -15,6 +15,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jdk.internal.org.jline.terminal.Terminal;
+
 /**
  * Attributed string.
  * Instances of this class are immutables.
@@ -103,11 +105,28 @@ public static AttributedString fromAnsi(String ansi, int tabs) {
     }
 
     public static AttributedString fromAnsi(String ansi, List<Integer> tabs) {
+        return fromAnsi(ansi, tabs, null, null);
+    }
+
+    public static AttributedString fromAnsi(String ansi, Terminal terminal) {
+        String alternateIn, alternateOut;
+        if (!DISABLE_ALTERNATE_CHARSET) {
+            alternateIn = Curses.tputs(terminal.getStringCapability(InfoCmp.Capability.enter_alt_charset_mode));
+            alternateOut = Curses.tputs(terminal.getStringCapability(InfoCmp.Capability.exit_alt_charset_mode));
+        } else {
+            alternateIn = null;
+            alternateOut = null;
+        }
+        return fromAnsi(ansi, Arrays.asList(0), alternateIn, alternateOut);
+    }
+
+    public static AttributedString fromAnsi(String ansi, List<Integer> tabs, String altIn, String altOut) {
         if (ansi == null) {
             return null;
         }
         return new AttributedStringBuilder(ansi.length())
                 .tabs(tabs)
+                .altCharset(altIn, altOut)
                 .ansiAppend(ansi)
                 .toAttributedString();
     }
@@ -116,9 +135,7 @@ public static String stripAnsi(String ansi) {
         if (ansi == null) {
             return null;
         }
-        return new AttributedStringBuilder(ansi.length())
-                .ansiAppend(ansi)
-                .toString();
+        return new AttributedStringBuilder(ansi.length()).ansiAppend(ansi).toString();
     }
 
     @Override
@@ -162,7 +179,7 @@ public AttributedString styleMatches(Pattern pattern, AttributedStyle style) {
                 }
                 result = matcher.find();
             } while (result);
-            return new AttributedString(buffer, newstyle, start , end);
+            return new AttributedString(buffer, newstyle, start, end);
         }
         return this;
     }
@@ -179,15 +196,16 @@ && arrEq(buffer, that.buffer, start, that.start, end - start)
 
     private boolean arrEq(char[] a1, char[] a2, int s1, int s2, int l) {
         for (int i = 0; i < l; i++) {
-            if (a1[s1+i] != a2[s2+i]) {
+            if (a1[s1 + i] != a2[s2 + i]) {
                 return false;
             }
         }
         return true;
     }
+
     private boolean arrEq(long[] a1, long[] a2, int s1, int s2, int l) {
         for (int i = 0; i < l; i++) {
-            if (a1[s1+i] != a2[s2+i]) {
+            if (a1[s1 + i] != a2[s2 + i]) {
                 return false;
             }
         }
@@ -221,5 +239,4 @@ public static AttributedString join(AttributedString delimiter, Iterable<Attribu
         }
         return sb.toAttributedString();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java
index 779675348c998..554381d367d94 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -27,6 +27,9 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
     private long[] style;
     private int length;
     private TabStops tabs = new TabStops(0);
+    private char[] altIn;
+    private char[] altOut;
+    private boolean inAltCharset;
     private int lastLineLength = 0;
     private AttributedStyle current = AttributedStyle.DEFAULT;
 
@@ -81,10 +84,7 @@ protected int offset() {
     @Override
     public AttributedString subSequence(int start, int end) {
         return new AttributedString(
-                Arrays.copyOfRange(buffer, start, end),
-                Arrays.copyOfRange(style, start, end),
-                0,
-                end - start);
+                Arrays.copyOfRange(buffer, start, end), Arrays.copyOfRange(style, start, end), 0, end - start);
     }
 
     @Override
@@ -108,6 +108,14 @@ public AttributedStringBuilder append(char c) {
         return append(Character.toString(c));
     }
 
+    public AttributedStringBuilder append(char c, int repeat) {
+        AttributedString s = new AttributedString(Character.toString(c), current);
+        while (repeat-- > 0) {
+            append(s);
+        }
+        return this;
+    }
+
     public AttributedStringBuilder append(CharSequence csq, AttributedStyle style) {
         return append(new AttributedString(csq, style));
     }
@@ -117,12 +125,12 @@ public AttributedStringBuilder style(AttributedStyle style) {
         return this;
     }
 
-    public AttributedStringBuilder style(Function<AttributedStyle,AttributedStyle> style) {
+    public AttributedStringBuilder style(Function<AttributedStyle, AttributedStyle> style) {
         current = style.apply(current);
         return this;
     }
 
-    public AttributedStringBuilder styled(Function<AttributedStyle,AttributedStyle> style, CharSequence cs) {
+    public AttributedStringBuilder styled(Function<AttributedStyle, AttributedStyle> style, CharSequence cs) {
         return styled(style, sb -> sb.append(cs));
     }
 
@@ -130,7 +138,8 @@ public AttributedStringBuilder styled(AttributedStyle style, CharSequence cs) {
         return styled(s -> style, sb -> sb.append(cs));
     }
 
-    public AttributedStringBuilder styled(Function<AttributedStyle,AttributedStyle> style, Consumer<AttributedStringBuilder> consumer) {
+    public AttributedStringBuilder styled(
+            Function<AttributedStyle, AttributedStyle> style, Consumer<AttributedStringBuilder> consumer) {
         AttributedStyle prev = current;
         current = style.apply(prev);
         consumer.accept(this);
@@ -338,23 +347,90 @@ public AttributedStringBuilder ansiAppend(String ansi) {
                     // This is not a SGR code, so ignore
                     ansiState = 0;
                 }
-            } else if (c == '\t' && tabs.defined()) {
-                insertTab(current);
             } else {
-                ensureCapacity(length + 1);
-                buffer[length] = c;
-                style[length] = this.current.getStyle();
-                if (c == '\n') {
-                    lastLineLength = 0;
+                if (ansiState >= 1) {
+                    ensureCapacity(length + 1);
+                    buffer[length++] = 27;
+                    if (ansiState >= 2) {
+                        ensureCapacity(length + 1);
+                        buffer[length++] = '[';
+                    }
+                    ansiState = 0;
+                }
+                if (c == '\t' && tabs.defined()) {
+                    insertTab(current);
                 } else {
-                    lastLineLength++;
+                    ensureCapacity(length + 1);
+                    if (inAltCharset) {
+                        switch (c) {
+                            case 'j':
+                                c = '\u2518';
+                                break;
+                            case 'k':
+                                c = '\u2510';
+                                break;
+                            case 'l':
+                                c = '\u250C';
+                                break;
+                            case 'm':
+                                c = '\u2514';
+                                break;
+                            case 'n':
+                                c = '\u253C';
+                                break;
+                            case 'q':
+                                c = '\u2500';
+                                break;
+                            case 't':
+                                c = '\u251C';
+                                break;
+                            case 'u':
+                                c = '\u2524';
+                                break;
+                            case 'v':
+                                c = '\u2534';
+                                break;
+                            case 'w':
+                                c = '\u252C';
+                                break;
+                            case 'x':
+                                c = '\u2502';
+                                break;
+                        }
+                    }
+                    buffer[length] = c;
+                    style[length] = this.current.getStyle();
+                    if (c == '\n') {
+                        lastLineLength = 0;
+                    } else {
+                        lastLineLength++;
+                    }
+                    length++;
+                    if (altIn != null && altOut != null) {
+                        char[] alt = inAltCharset ? altOut : altIn;
+                        if (equals(buffer, length - alt.length, alt, 0, alt.length)) {
+                            inAltCharset = !inAltCharset;
+                            length -= alt.length;
+                        }
+                    }
                 }
-                length++;
             }
         }
         return this;
     }
 
+    private static boolean equals(char[] a, int aFromIndex, char[] b, int bFromIndex, int length) {
+        if (aFromIndex < 0 || bFromIndex < 0 || aFromIndex + length > a.length || bFromIndex + length > b.length) {
+            return false;
+        }
+        for (int i = 0; i < length; i++) {
+            if (a[aFromIndex + i] != b[bFromIndex + i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     protected void insertTab(AttributedStyle s) {
         int nb = tabs.spaces(lastLineLength);
         ensureCapacity(length + nb);
@@ -393,6 +469,15 @@ public AttributedStringBuilder tabs(List<Integer> tabs) {
         return this;
     }
 
+    public AttributedStringBuilder altCharset(String altIn, String altOut) {
+        if (length > 0) {
+            throw new IllegalStateException("Cannot change alternative charset after appending text");
+        }
+        this.altIn = altIn != null ? altIn.toCharArray() : null;
+        this.altOut = altOut != null ? altOut.toCharArray() : null;
+        return this;
+    }
+
     public AttributedStringBuilder styleMatches(Pattern pattern, AttributedStyle s) {
         Matcher matcher = pattern.matcher(this);
         while (matcher.find()) {
@@ -416,7 +501,7 @@ public AttributedStringBuilder styleMatches(Pattern pattern, List<AttributedStyl
         return this;
     }
 
-    private class TabStops {
+    private static class TabStops {
         private List<Integer> tabs = new ArrayList<>();
         private int lastStop = 0;
         private int lastSize = 0;
@@ -428,7 +513,7 @@ public TabStops(int tabs) {
         public TabStops(List<Integer> tabs) {
             this.tabs = tabs;
             int p = 0;
-            for (int s: tabs) {
+            for (int s : tabs) {
                 if (s <= p) {
                     continue;
                 }
@@ -447,7 +532,7 @@ int spaces(int lastLineLength) {
             if (lastLineLength >= lastStop) {
                 out = lastSize - (lastLineLength - lastStop) % lastSize;
             } else {
-                for (int s: tabs) {
+                for (int s : tabs) {
                     if (s > lastLineLength) {
                         out = s - lastLineLength;
                         break;
@@ -456,7 +541,5 @@ int spaces(int lastLineLength) {
             }
             return out;
         }
-
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStyle.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStyle.java
index 902e2e1f3b849..7845e99e0b0f9 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStyle.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -15,39 +15,39 @@
  */
 public class AttributedStyle {
 
-    public static final int BLACK =     0;
-    public static final int RED =       1;
-    public static final int GREEN =     2;
-    public static final int YELLOW =    3;
-    public static final int BLUE =      4;
-    public static final int MAGENTA =   5;
-    public static final int CYAN =      6;
-    public static final int WHITE =     7;
-
-    public static final int BRIGHT =    8;
-
-    static final long F_BOLD            = 0x00000001;
-    static final long F_FAINT           = 0x00000002;
-    static final long F_ITALIC          = 0x00000004;
-    static final long F_UNDERLINE       = 0x00000008;
-    static final long F_BLINK           = 0x00000010;
-    static final long F_INVERSE         = 0x00000020;
-    static final long F_CONCEAL         = 0x00000040;
-    static final long F_CROSSED_OUT     = 0x00000080;
-    static final long F_FOREGROUND_IND  = 0x00000100;
-    static final long F_FOREGROUND_RGB  = 0x00000200;
-    static final long F_FOREGROUND      = F_FOREGROUND_IND | F_FOREGROUND_RGB;
-    static final long F_BACKGROUND_IND  = 0x00000400;
-    static final long F_BACKGROUND_RGB  = 0x00000800;
-    static final long F_BACKGROUND      = F_BACKGROUND_IND | F_BACKGROUND_RGB;
-    static final long F_HIDDEN          = 0x00001000;
-
-    static final long MASK           = 0x00001FFF;
-
-    static final int FG_COLOR_EXP    = 15;
-    static final int BG_COLOR_EXP    = 39;
-    static final long FG_COLOR        = 0xFFFFFFL << FG_COLOR_EXP;
-    static final long BG_COLOR        = 0xFFFFFFL << BG_COLOR_EXP;
+    public static final int BLACK = 0;
+    public static final int RED = 1;
+    public static final int GREEN = 2;
+    public static final int YELLOW = 3;
+    public static final int BLUE = 4;
+    public static final int MAGENTA = 5;
+    public static final int CYAN = 6;
+    public static final int WHITE = 7;
+
+    public static final int BRIGHT = 8;
+
+    static final long F_BOLD = 0x00000001;
+    static final long F_FAINT = 0x00000002;
+    static final long F_ITALIC = 0x00000004;
+    static final long F_UNDERLINE = 0x00000008;
+    static final long F_BLINK = 0x00000010;
+    static final long F_INVERSE = 0x00000020;
+    static final long F_CONCEAL = 0x00000040;
+    static final long F_CROSSED_OUT = 0x00000080;
+    static final long F_FOREGROUND_IND = 0x00000100;
+    static final long F_FOREGROUND_RGB = 0x00000200;
+    static final long F_FOREGROUND = F_FOREGROUND_IND | F_FOREGROUND_RGB;
+    static final long F_BACKGROUND_IND = 0x00000400;
+    static final long F_BACKGROUND_RGB = 0x00000800;
+    static final long F_BACKGROUND = F_BACKGROUND_IND | F_BACKGROUND_RGB;
+    static final long F_HIDDEN = 0x00001000;
+
+    static final long MASK = 0x00001FFF;
+
+    static final int FG_COLOR_EXP = 15;
+    static final int BG_COLOR_EXP = 39;
+    static final long FG_COLOR = 0xFFFFFFL << FG_COLOR_EXP;
+    static final long BG_COLOR = 0xFFFFFFL << BG_COLOR_EXP;
 
     public static final AttributedStyle DEFAULT = new AttributedStyle();
     public static final AttributedStyle BOLD = DEFAULT.bold();
@@ -70,8 +70,9 @@ public AttributedStyle(AttributedStyle s) {
 
     public AttributedStyle(long style, long mask) {
         this.style = style;
-        this.mask = mask & MASK | ((style & F_FOREGROUND) != 0 ? FG_COLOR : 0)
-                                | ((style & F_BACKGROUND) != 0 ? BG_COLOR : 0);
+        this.mask = mask & MASK
+                | ((style & F_FOREGROUND) != 0 ? FG_COLOR : 0)
+                | ((style & F_BACKGROUND) != 0 ? BG_COLOR : 0);
     }
 
     public AttributedStyle bold() {
@@ -176,7 +177,9 @@ public AttributedStyle crossedOutDefault() {
     }
 
     public AttributedStyle foreground(int color) {
-        return new AttributedStyle(style & ~FG_COLOR | F_FOREGROUND_IND | (((long) color << FG_COLOR_EXP) & FG_COLOR), mask | F_FOREGROUND_IND);
+        return new AttributedStyle(
+                style & ~FG_COLOR | F_FOREGROUND_IND | (((long) color << FG_COLOR_EXP) & FG_COLOR),
+                mask | F_FOREGROUND_IND);
     }
 
     public AttributedStyle foreground(int r, int g, int b) {
@@ -184,7 +187,9 @@ public AttributedStyle foreground(int r, int g, int b) {
     }
 
     public AttributedStyle foregroundRgb(int color) {
-        return new AttributedStyle(style & ~FG_COLOR | F_FOREGROUND_RGB | ((((long) color & 0xFFFFFF) << FG_COLOR_EXP) & FG_COLOR), mask | F_FOREGROUND_RGB);
+        return new AttributedStyle(
+                style & ~FG_COLOR | F_FOREGROUND_RGB | ((((long) color & 0xFFFFFF) << FG_COLOR_EXP) & FG_COLOR),
+                mask | F_FOREGROUND_RGB);
     }
 
     public AttributedStyle foregroundOff() {
@@ -196,7 +201,9 @@ public AttributedStyle foregroundDefault() {
     }
 
     public AttributedStyle background(int color) {
-        return new AttributedStyle(style & ~BG_COLOR | F_BACKGROUND_IND | (((long) color << BG_COLOR_EXP) & BG_COLOR), mask | F_BACKGROUND_IND);
+        return new AttributedStyle(
+                style & ~BG_COLOR | F_BACKGROUND_IND | (((long) color << BG_COLOR_EXP) & BG_COLOR),
+                mask | F_BACKGROUND_IND);
     }
 
     public AttributedStyle background(int r, int g, int b) {
@@ -204,7 +211,9 @@ public AttributedStyle background(int r, int g, int b) {
     }
 
     public AttributedStyle backgroundRgb(int color) {
-        return new AttributedStyle(style & ~BG_COLOR | F_BACKGROUND_RGB | ((((long) color & 0xFFFFFF) << BG_COLOR_EXP) & BG_COLOR), mask | F_BACKGROUND_RGB);
+        return new AttributedStyle(
+                style & ~BG_COLOR | F_BACKGROUND_RGB | ((((long) color & 0xFFFFFF) << BG_COLOR_EXP) & BG_COLOR),
+                mask | F_BACKGROUND_RGB);
     }
 
     public AttributedStyle backgroundOff() {
@@ -249,7 +258,6 @@ public boolean equals(Object o) {
         AttributedStyle that = (AttributedStyle) o;
         if (style != that.style) return false;
         return mask == that.mask;
-
     }
 
     @Override
@@ -266,10 +274,6 @@ public String toAnsi() {
 
     @Override
     public String toString() {
-        return "AttributedStyle{" +
-                "style=" + style +
-                ", mask=" + mask +
-                ", ansi=" + toAnsi() +
-                '}';
+        return "AttributedStyle{" + "style=" + style + ", mask=" + mask + ", ansi=" + toAnsi() + '}';
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ClosedException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ClosedException.java
index f2adb0878c718..a6f5bfb5b5463 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ClosedException.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ClosedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,8 +14,7 @@ public class ClosedException extends IOException {
 
     private static final long serialVersionUID = 3085420657077696L;
 
-    public ClosedException() {
-    }
+    public ClosedException() {}
 
     public ClosedException(String message) {
         super(message);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ColorPalette.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ColorPalette.java
index 6f55273a7b935..b4175fe13cec5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ColorPalette.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ColorPalette.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,7 +21,8 @@
  */
 public class ColorPalette {
 
-    public static final String XTERM_INITC = "\\E]4;%p1%d;rgb\\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\\E\\\\";
+    public static final String XTERM_INITC =
+            "\\E]4;%p1%d;rgb\\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\\E\\\\";
 
     public static final ColorPalette DEFAULT = new ColorPalette();
 
@@ -41,6 +42,7 @@ public ColorPalette(Terminal terminal) throws IOException {
         this(terminal, null);
     }
 
+    @SuppressWarnings("this-escape")
     public ColorPalette(Terminal terminal, String distance) throws IOException {
         this.terminal = terminal;
         this.distanceName = distance;
@@ -245,10 +247,13 @@ private static int[] doLoad(Terminal terminal) throws IOException {
                 if (rgb.size() != 3) {
                     return null;
                 }
-                double r = Integer.parseInt(rgb.get(0), 16) / ((1 << (4 * rgb.get(0).length())) - 1.0);
-                double g = Integer.parseInt(rgb.get(1), 16) / ((1 << (4 * rgb.get(1).length())) - 1.0);
-                double b = Integer.parseInt(rgb.get(2), 16) / ((1 << (4 * rgb.get(2).length())) - 1.0);
-                palette[idx] = (int)((Math.round(r * 255) << 16) + (Math.round(g * 255) << 8) + Math.round(b * 255));
+                double r = Integer.parseInt(rgb.get(0), 16)
+                        / ((1 << (4 * rgb.get(0).length())) - 1.0);
+                double g = Integer.parseInt(rgb.get(1), 16)
+                        / ((1 << (4 * rgb.get(1).length())) - 1.0);
+                double b = Integer.parseInt(rgb.get(2), 16)
+                        / ((1 << (4 * rgb.get(2).length())) - 1.0);
+                palette[idx] = (int) ((Math.round(r * 255) << 16) + (Math.round(g * 255) << 8) + Math.round(b * 255));
                 black &= palette[idx] == 0;
             }
             if (black) {
@@ -256,7 +261,13 @@ private static int[] doLoad(Terminal terminal) throws IOException {
             }
         }
         int max = 256;
-        while (max > 0 && palette[--max] == 0);
+        while (max > 0 && palette[--max] == 0)
+            ;
         return Arrays.copyOfRange(palette, 0, max + 1);
     }
+
+    @Override
+    public String toString() {
+        return "ColorPalette[" + "length=" + getLength() + ", " + "distance='" + getDist() + "\']";
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Colors.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Colors.java
index dc452e103645f..d5e7644d3cb44 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Colors.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Colors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,6 +21,8 @@
 
 public class Colors {
 
+    // @spotless:off
+
     /**
      * Default 256 colors palette
      */
@@ -111,24 +113,26 @@ public class Colors {
             0x2e2e2e, 0x5c5c5c, 0x737373, 0x8b8b8b, 0xa2a2a2, 0xb9b9b9, 0xd0d0d0, 0xe7e7e7,
     };
 
+    // @spotless:on
+
     /** D50 illuminant for CAM color spaces */
-    public static final double[] D50 = new double[] { 96.422f, 100.0f,  82.521f };
+    public static final double[] D50 = new double[] {96.422f, 100.0f, 82.521f};
     /** D65 illuminant for CAM color spaces */
-    public static final double[] D65 = new double[] { 95.047, 100.0, 108.883 };
+    public static final double[] D65 = new double[] {95.047, 100.0, 108.883};
 
     /** Average surrounding for CAM color spaces */
-    public static final double[] averageSurrounding = new double[] { 1.0, 0.690, 1.0 };
+    public static final double[] averageSurrounding = new double[] {1.0, 0.690, 1.0};
     /** Dim surrounding for CAM color spaces */
-    public static final double[] dimSurrounding =     new double[] { 0.9, 0.590, 0.9 };
+    public static final double[] dimSurrounding = new double[] {0.9, 0.590, 0.9};
     /** Dark surrounding for CAM color spaces */
-    public static final double[] darkSurrounding =    new double[] { 0.8, 0.525, 0.8 };
+    public static final double[] darkSurrounding = new double[] {0.8, 0.525, 0.8};
 
     /** sRGB encoding environment */
-    public static final double[] sRGB_encoding_environment = vc(D50,  64.0,  64.0/5, dimSurrounding);
+    public static final double[] sRGB_encoding_environment = vc(D50, 64.0, 64.0 / 5, dimSurrounding);
     /** sRGB typical environment */
-    public static final double[] sRGB_typical_environment  = vc(D50, 200.0, 200.0/5, averageSurrounding);
+    public static final double[] sRGB_typical_environment = vc(D50, 200.0, 200.0 / 5, averageSurrounding);
     /** Adobe RGB environment */
-    public static final double[] AdobeRGB_environment      = vc(D65, 160.0, 160.0/5, averageSurrounding);
+    public static final double[] AdobeRGB_environment = vc(D65, 160.0, 160.0 / 5, averageSurrounding);
 
     private static int[] COLORS_256 = DEFAULT_COLORS_256;
 
@@ -149,8 +153,9 @@ public static Integer rgbColor(String name) {
         if (COLOR_NAMES == null) {
             Map<String, Integer> colors = new LinkedHashMap<>();
             try (InputStream is = InfoCmp.class.getResourceAsStream("colors.txt");
-                 BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-                br.lines().map(String::trim)
+                    BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+                br.lines()
+                        .map(String::trim)
                         .filter(s -> !s.startsWith("#"))
                         .filter(s -> !s.isEmpty())
                         .forEachOrdered(s -> {
@@ -206,7 +211,7 @@ static Distance getDistance(String dist) {
         if (dist == null) {
             dist = System.getProperty(PROP_COLOR_DISTANCE, "cie76");
         }
-        return doGetDistance(dist);
+        return new NamedDistance(dist, doGetDistance(dist));
     }
 
     private static Distance doGetDistance(String dist) {
@@ -216,7 +221,7 @@ private static Distance doGetDistance(String dist) {
                 double[] c1 = rgb(p1);
                 double[] c2 = rgb(p2);
                 double rmean = (c1[0] + c2[0]) / 2.0;
-                double[] w = { 2.0 + rmean, 4.0, 3.0 - rmean };
+                double[] w = {2.0 + rmean, 4.0, 3.0 - rmean};
                 return scalar(c1, c2, w);
             };
         }
@@ -228,7 +233,7 @@ private static Distance doGetDistance(String dist) {
         }
         if (dist.matches("lab\\(([0-9]+(\\.[0-9]+)?),([0-9]+(\\.[0-9]+)?)\\)")) {
             double[] w = getWeights(dist);
-            return (p1, p2) -> scalar(rgb2cielab(p1), rgb2cielab(p2), new double[] { w[0], w[1], w[1] });
+            return (p1, p2) -> scalar(rgb2cielab(p1), rgb2cielab(p2), new double[] {w[0], w[1], w[1]});
         }
         if (dist.equals("cie94")) {
             return (p1, p2) -> cie94(rgb2cielab(p1), rgb2cielab(p2));
@@ -251,7 +256,7 @@ private static Distance doGetDistance(String dist) {
                 double[] c1 = camlab(p1, sRGB_typical_environment);
                 double[] c2 = camlab(p2, sRGB_typical_environment);
                 double[] w = getWeights(dist);
-                return scalar(c1, c2, new double[] { w[0], w[1], w[1] });
+                return scalar(c1, c2, new double[] {w[0], w[1], w[1]});
             };
         }
         if (dist.matches("camlch")) {
@@ -273,20 +278,37 @@ private static Distance doGetDistance(String dist) {
     }
 
     private static double[] getWeights(String dist) {
-        String[] weights = dist.substring(dist.indexOf('(') + 1, dist.length() - 1).split(",");
+        String[] weights =
+                dist.substring(dist.indexOf('(') + 1, dist.length() - 1).split(",");
         return Stream.of(weights).mapToDouble(Double::parseDouble).toArray();
     }
 
     private static double scalar(double[] c1, double[] c2, double[] w) {
-        return sqr((c1[0] - c2[0]) * w[0])
-             + sqr((c1[1] - c2[1]) * w[1])
-             + sqr((c1[2] - c2[2]) * w[2]);
+        return sqr((c1[0] - c2[0]) * w[0]) + sqr((c1[1] - c2[1]) * w[1]) + sqr((c1[2] - c2[2]) * w[2]);
     }
 
     private static double scalar(double[] c1, double[] c2) {
-        return sqr(c1[0] - c2[0])
-             + sqr(c1[1] - c2[1])
-             + sqr(c1[2] - c2[2]);
+        return sqr(c1[0] - c2[0]) + sqr(c1[1] - c2[1]) + sqr(c1[2] - c2[2]);
+    }
+
+    private static class NamedDistance implements Distance {
+        private final String name;
+        private final Distance delegate;
+
+        public NamedDistance(String name, Distance delegate) {
+            this.name = name;
+            this.delegate = delegate;
+        }
+
+        @Override
+        public double compute(int c1, int c2) {
+            return delegate.compute(c1, c2);
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
     }
 
     private static final int L = 0;
@@ -325,7 +347,7 @@ private static double cie00(double[] lab1, double[] lab2) {
         double c_star_average_ab = (c_star_1_ab + c_star_2_ab) / 2.0;
         double c_star_average_ab_pot_3 = c_star_average_ab * c_star_average_ab * c_star_average_ab;
         double c_star_average_ab_pot_7 = c_star_average_ab_pot_3 * c_star_average_ab_pot_3 * c_star_average_ab;
-        double G = 0.5 * (1.0 - Math.sqrt(c_star_average_ab_pot_7 / (c_star_average_ab_pot_7 + 6103515625.0))); //25^7
+        double G = 0.5 * (1.0 - Math.sqrt(c_star_average_ab_pot_7 / (c_star_average_ab_pot_7 + 6103515625.0))); // 25^7
         double a1_prime = (1.0 + G) * lab1[A];
         double a2_prime = (1.0 + G) * lab2[A];
         double C_prime_1 = Math.sqrt(a1_prime * a1_prime + lab1[B] * lab1[B]);
@@ -365,16 +387,18 @@ private static double cie00(double[] lab1, double[] lab2) {
                 + 0.24 * Math.cos(Math.toRadians(h_prime_average * 2.0))
                 + 0.32 * Math.cos(Math.toRadians(h_prime_average * 3.0 + 6.0))
                 - 0.20 * Math.cos(Math.toRadians(h_prime_average * 4.0 - 63.0));
-        double S_L = 1.0 + ((0.015 * L_prime_average_minus_50_square) / Math.sqrt(20.0 + L_prime_average_minus_50_square));
+        double S_L =
+                1.0 + ((0.015 * L_prime_average_minus_50_square) / Math.sqrt(20.0 + L_prime_average_minus_50_square));
         double S_C = 1.0 + 0.045 * C_prime_average;
         double S_H = 1.0 + 0.015 * T * C_prime_average;
         double h_prime_average_minus_275_div_25 = (h_prime_average - 275.0) / (25.0);
-        double h_prime_average_minus_275_div_25_square = h_prime_average_minus_275_div_25 * h_prime_average_minus_275_div_25;
+        double h_prime_average_minus_275_div_25_square =
+                h_prime_average_minus_275_div_25 * h_prime_average_minus_275_div_25;
         double delta_theta = 30.0 * Math.exp(-h_prime_average_minus_275_div_25_square);
         double C_prime_average_pot_3 = C_prime_average * C_prime_average * C_prime_average;
         double C_prime_average_pot_7 = C_prime_average_pot_3 * C_prime_average_pot_3 * C_prime_average;
-        double R_C = 2.0 * Math.sqrt(C_prime_average_pot_7 / (C_prime_average_pot_7 + 6103515625.0)); //25^7
-        double R_T = - Math.sin(Math.toRadians(2.0 * delta_theta)) * R_C;
+        double R_C = 2.0 * Math.sqrt(C_prime_average_pot_7 / (C_prime_average_pot_7 + 6103515625.0)); // 25^7
+        double R_T = -Math.sin(Math.toRadians(2.0 * delta_theta)) * R_C;
         double dLKlsl = delta_L_prime / (kl * S_L);
         double dCkcsc = delta_C_prime / (kc * S_C);
         double dHkhsh = delta_H_prime / (kh * S_H);
@@ -392,11 +416,11 @@ private static double[] jmh2ucs(double[] lch) {
         double sM = ((1.0 / 0.0228) * Math.log(1.0 + 0.0228 * lch[1]));
         double a = sM * Math.cos(Math.toRadians(lch[2]));
         double b = sM * Math.sin(Math.toRadians(lch[2]));
-        return new double[] {sJ, a, b };
+        return new double[] {sJ, a, b};
     }
 
     static double camlch(double[] c1, double[] c2) {
-        return camlch(c1, c2, new double[] { 1.0, 1.0, 1.0 });
+        return camlch(c1, c2, new double[] {1.0, 1.0, 1.0});
     }
 
     static double camlch(double[] c1, double[] c2, double[] w) {
@@ -414,18 +438,16 @@ static double camlch(double[] c1, double[] c2, double[] w) {
     private static double hueDifference(double hue1, double hue2, double c) {
         double difference = (hue2 - hue1) % c;
         double ch = c / 2;
-        if (difference > ch)
-            difference -= c;
-        if (difference < -ch)
-            difference += c;
+        if (difference > ch) difference -= c;
+        if (difference < -ch) difference += c;
         return difference;
     }
 
     private static double[] rgb(int color) {
         int r = (color >> 16) & 0xFF;
-        int g = (color >>  8) & 0xFF;
-        int b = (color >>  0) & 0xFF;
-        return new double[] { r / 255.0, g / 255.0, b / 255.0 };
+        int g = (color >> 8) & 0xFF;
+        int b = (color >> 0) & 0xFF;
+        return new double[] {r / 255.0, g / 255.0, b / 255.0};
     }
 
     static double[] rgb2xyz(int color) {
@@ -454,13 +476,13 @@ static double[] camlab(int color, double[] vc) {
 
     static double[] lch2lab(double[] lch) {
         double toRad = Math.PI / 180;
-        return new double[] { lch[0], lch[1] * Math.cos(lch[2] * toRad), lch[1] * Math.sin(lch[2] * toRad) };
+        return new double[] {lch[0], lch[1] * Math.cos(lch[2] * toRad), lch[1] * Math.sin(lch[2] * toRad)};
     }
 
     private static double[] xyz2camlch(double[] xyz, double[] vc) {
         double[] XYZ = new double[] {xyz[0] * 100.0, xyz[1] * 100.0, xyz[2] * 100.0};
         double[] cam = forwardTransform(XYZ, vc);
-        return new double[] { cam[J], cam[M], cam[h] };
+        return new double[] {cam[J], cam[M], cam[h]};
     }
 
     /** Lightness */
@@ -478,12 +500,12 @@ private static double[] xyz2camlch(double[] xyz, double[] vc) {
     /** Hue */
     public static final int h = 6;
 
-
     /** CIECAM02 appearance correlates */
     private static double[] forwardTransform(double[] XYZ, double[] vc) {
         // calculate sharpened cone response
         double[] RGB = forwardPreAdaptationConeResponse(XYZ);
-        // calculate corresponding (sharpened) cone response considering various luminance level and surround conditions in D
+        // calculate corresponding (sharpened) cone response considering various luminance level and surround conditions
+        // in D
         double[] RGB_c = forwardPostAdaptationConeResponse(RGB, vc);
         // calculate HPE equal area cone fundamentals
         double[] RGBPrime = CAT02toHPE(RGB_c);
@@ -501,37 +523,40 @@ private static double[] forwardTransform(double[] XYZ, double[] vc) {
         // calculate eccentricity
         double e = ((12500.0 / 13.0) * vc[VC_N_C] * vc[VC_N_CB]) * (Math.cos(Math.toRadians(h) + 2.0) + 3.8);
         // get t
-        double t = e * Math.sqrt(Math.pow(a, 2.0) + Math.pow(b, 2.0)) / (RGBPrime_a[0] + RGBPrime_a[1] + 1.05 * RGBPrime_a[2]);
+        double t = e
+                * Math.sqrt(Math.pow(a, 2.0) + Math.pow(b, 2.0))
+                / (RGBPrime_a[0] + RGBPrime_a[1] + 1.05 * RGBPrime_a[2]);
         // calculate brightness
         double Q = (4.0 / vc[VC_C]) * Math.sqrt(J / 100.0) * (vc[VC_A_W] + 4.0) * Math.pow(vc[VC_F_L], 0.25);
         // calculate the correlates of chroma, colorfulness, and saturation
-        double C = Math.signum(t) * Math.pow(Math.abs(t), 0.9) * Math.sqrt(J / 100.0) * Math.pow(1.64- Math.pow(0.29, vc[VC_N]), 0.73);
+        double C = Math.signum(t)
+                * Math.pow(Math.abs(t), 0.9)
+                * Math.sqrt(J / 100.0)
+                * Math.pow(1.64 - Math.pow(0.29, vc[VC_N]), 0.73);
         double M = C * Math.pow(vc[VC_F_L], 0.25);
         double s = 100.0 * Math.sqrt(M / Q);
         // calculate hue composition
         double H = calculateH(h);
-        return new double[] { J, Q, C, M, s, H, h };
+        return new double[] {J, Q, C, M, s, H, h};
     }
 
     private static double calculateH(double h) {
-        if (h < 20.14)
-            h = h + 360;
+        if (h < 20.14) h = h + 360;
         double i;
-        if (h >= 20.14 && h < 90.0) {  // index i = 1
+        if (h >= 20.14 && h < 90.0) { // index i = 1
             i = (h - 20.14) / 0.8;
             return 100.0 * i / (i + (90 - h) / 0.7);
         } else if (h < 164.25) { // index i = 2
             i = (h - 90) / 0.7;
             return 100.0 + 100.0 * i / (i + (164.25 - h) / 1);
-        } else if (h < 237.53) {  // index i = 3
+        } else if (h < 237.53) { // index i = 3
             i = (h - 164.25) / 1.0;
             return 200.0 + 100.0 * i / (i + (237.53 - h) / 1.2);
-        } else if (h <= 380.14) {  // index i = 4
+        } else if (h <= 380.14) { // index i = 4
             i = (h - 237.53) / 1.2;
             double H = 300.0 + 100.0 * i / (i + (380.14 - h) / 0.8);
             // don't use 400 if we can use 0
-            if (H <= 400.0 && H >= 399.999)
-                H = 0;
+            if (H <= 400.0 && H >= 399.999) H = 0;
             return H;
         } else {
             throw new IllegalArgumentException("h outside assumed range 0..360: " + h);
@@ -540,8 +565,8 @@ private static double calculateH(double h) {
 
     private static double[] forwardResponseCompression(double[] RGB, double[] vc) {
         double[] result = new double[3];
-        for(int channel = 0; channel < RGB.length; channel++) {
-            if(RGB[channel] >= 0) {
+        for (int channel = 0; channel < RGB.length; channel++) {
+            if (RGB[channel] >= 0) {
                 double n = Math.pow(vc[VC_F_L] * RGB[channel] / 100.0, 0.42);
                 result[channel] = 400.0 * n / (n + 27.13) + 0.1;
             } else {
@@ -553,22 +578,22 @@ private static double[] forwardResponseCompression(double[] RGB, double[] vc) {
     }
 
     private static double[] forwardPostAdaptationConeResponse(double[] RGB, double[] vc) {
-        return new double[] { vc[VC_D_RGB_R] * RGB[0], vc[VC_D_RGB_G] * RGB[1], vc[VC_D_RGB_B] * RGB[2] };
+        return new double[] {vc[VC_D_RGB_R] * RGB[0], vc[VC_D_RGB_G] * RGB[1], vc[VC_D_RGB_B] * RGB[2]};
     }
 
     public static double[] CAT02toHPE(double[] RGB) {
         double[] RGBPrime = new double[3];
-        RGBPrime[0] =  0.7409792 * RGB[0] + 0.2180250 * RGB[1] + 0.0410058 * RGB[2];
-        RGBPrime[1] =  0.2853532 * RGB[0] + 0.6242014 * RGB[1] + 0.0904454 * RGB[2];
+        RGBPrime[0] = 0.7409792 * RGB[0] + 0.2180250 * RGB[1] + 0.0410058 * RGB[2];
+        RGBPrime[1] = 0.2853532 * RGB[0] + 0.6242014 * RGB[1] + 0.0904454 * RGB[2];
         RGBPrime[2] = -0.0096280 * RGB[0] - 0.0056980 * RGB[1] + 1.0153260 * RGB[2];
         return RGBPrime;
     }
 
     private static double[] forwardPreAdaptationConeResponse(double[] XYZ) {
         double[] RGB = new double[3];
-        RGB[0] =  0.7328 * XYZ[0] + 0.4296 * XYZ[1] - 0.1624 * XYZ[2];
+        RGB[0] = 0.7328 * XYZ[0] + 0.4296 * XYZ[1] - 0.1624 * XYZ[2];
         RGB[1] = -0.7036 * XYZ[0] + 1.6975 * XYZ[1] + 0.0061 * XYZ[2];
-        RGB[2] =  0.0030 * XYZ[0] + 0.0136 * XYZ[1] + 0.9834 * XYZ[2];
+        RGB[2] = 0.0030 * XYZ[0] + 0.0136 * XYZ[1] + 0.9834 * XYZ[2];
         return RGB;
     }
 
@@ -581,8 +606,8 @@ private static double[] forwardPreAdaptationConeResponse(double[] XYZ) {
     static final int VC_Z_W = 2;
     static final int VC_L_A = 3;
     static final int VC_Y_B = 4;
-    static final int VC_F =   5;
-    static final int VC_C =   6;
+    static final int VC_F = 5;
+    static final int VC_C = 6;
     static final int VC_N_C = 7;
 
     static final int VC_Z = 8;
@@ -607,33 +632,33 @@ static double[] vc(double[] xyz_w, double L_A, double Y_b, double[] surrounding)
         vc[VC_N_C] = surrounding[SUR_N_C];
 
         double[] RGB_w = forwardPreAdaptationConeResponse(xyz_w);
-        double D = Math.max(0.0, Math.min(1.0, vc[VC_F] * (1.0 - (1.0 / 3.6) * Math.pow(Math.E, (-L_A - 42.0) / 92.0))));
+        double D =
+                Math.max(0.0, Math.min(1.0, vc[VC_F] * (1.0 - (1.0 / 3.6) * Math.pow(Math.E, (-L_A - 42.0) / 92.0))));
         double Yw = xyz_w[1];
         double[] RGB_c = new double[] {
-                (D * Yw / RGB_w[0]) + (1.0 - D),
-                (D * Yw / RGB_w[1]) + (1.0 - D),
-                (D * Yw / RGB_w[2]) + (1.0 - D),
+            (D * Yw / RGB_w[0]) + (1.0 - D), (D * Yw / RGB_w[1]) + (1.0 - D), (D * Yw / RGB_w[2]) + (1.0 - D),
         };
 
         // calculate increase in brightness and colorfulness caused by brighter viewing environments
         double L_Ax5 = 5.0 * L_A;
         double k = 1.0 / (L_Ax5 + 1.0);
         double kpow4 = Math.pow(k, 4.0);
-        vc[VC_F_L] = 0.2 * kpow4 * (L_Ax5) + 0.1 * Math.pow(1.0 - kpow4, 2.0) * Math.pow(L_Ax5, 1.0/3.0);
+        vc[VC_F_L] = 0.2 * kpow4 * (L_Ax5) + 0.1 * Math.pow(1.0 - kpow4, 2.0) * Math.pow(L_Ax5, 1.0 / 3.0);
 
         // calculate response compression on J and C caused by background lightness.
         vc[VC_N] = Y_b / Yw;
         vc[VC_Z] = 1.48 + Math.sqrt(vc[VC_N]);
 
         vc[VC_N_BB] = 0.725 * Math.pow(1.0 / vc[VC_N], 0.2);
-        vc[VC_N_CB] = vc[VC_N_BB]; // chromatic contrast factors (calculate increase in J, Q, and C caused by dark backgrounds)
+        vc[VC_N_CB] = vc[
+                VC_N_BB]; // chromatic contrast factors (calculate increase in J, Q, and C caused by dark backgrounds)
 
         // calculate achromatic response to white
         double[] RGB_wc = new double[] {RGB_c[0] * RGB_w[0], RGB_c[1] * RGB_w[1], RGB_c[2] * RGB_w[2]};
         double[] RGBPrime_w = CAT02toHPE(RGB_wc);
         double[] RGBPrime_aw = new double[3];
-        for(int channel = 0; channel < RGBPrime_w.length; channel++) {
-            if(RGBPrime_w[channel] >= 0) {
+        for (int channel = 0; channel < RGBPrime_w.length; channel++) {
+            if (RGBPrime_w[channel] >= 0) {
                 double n = Math.pow(vc[VC_F_L] * RGBPrime_w[channel] / 100.0, 0.42);
                 RGBPrime_aw[channel] = 400.0 * n / (n + 27.13) + 0.1;
             } else {
@@ -660,7 +685,7 @@ private static double[] rgb2xyz(double[] rgb) {
         double x = vr * 0.4124564 + vg * 0.3575761 + vb * 0.1804375;
         double y = vr * 0.2126729 + vg * 0.7151522 + vb * 0.0721750;
         double z = vr * 0.0193339 + vg * 0.1191920 + vb * 0.9503041;
-        return new double[] { x, y, z };
+        return new double[] {x, y, z};
     }
 
     private static double pivotRgb(double n) {
@@ -674,11 +699,12 @@ private static double[] xyz2lab(double[] xyz) {
         double l = 116.0 * fy - 16.0;
         double a = 500.0 * (fx - fy);
         double b = 200.0 * (fy - fz);
-        return new double[] { l, a, b };
+        return new double[] {l, a, b};
     }
 
     private static final double epsilon = 216.0 / 24389.0;
     private static final double kappa = 24389.0 / 27.0;
+
     private static double pivotXyz(double n) {
         return n > epsilon ? Math.cbrt(n) : (kappa * n + 16) / 116;
     }
@@ -686,5 +712,4 @@ private static double pivotXyz(double n) {
     private static double sqr(double n) {
         return n * n;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Curses.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Curses.java
index bdfd4c37bc2d8..b9ada27070577 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Curses.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Curses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -29,8 +29,7 @@ public final class Curses {
     private static final int IFTE_THEN = 2;
     private static final int IFTE_ELSE = 3;
 
-    private Curses() {
-    }
+    private Curses() {}
 
     /**
      * Print the given terminal capabilities
@@ -95,9 +94,9 @@ private static void doTputs(Appendable out, String str, Object... params) throws
                             case 'n':
                                 out.append('\n');
                                 break;
-//                        case 'l':
-//                            rawPrint('\l');
-//                            break;
+                                //                        case 'l':
+                                //                            rawPrint('\l');
+                                //                            break;
                             case 'r':
                                 if (exec) {
                                     out.append('\r');
@@ -138,7 +137,7 @@ private static void doTputs(Appendable out, String str, Object... params) throws
                 case '^':
                     ch = str.charAt(index++);
                     if (exec) {
-                        out.append((char)(ch - '@'));
+                        out.append((char) (ch - '@'));
                     }
                     break;
                 case '%':
@@ -195,7 +194,8 @@ private static void doTputs(Appendable out, String str, Object... params) throws
                             break;
                         case '{':
                             int start = index;
-                            while (str.charAt(index++) != '}') ;
+                            while (str.charAt(index++) != '}')
+                                ;
                             if (exec) {
                                 int v = Integer.parseInt(str.substring(start, index - 1));
                                 stack.push(v);
@@ -364,10 +364,18 @@ private static void doTputs(Appendable out, String str, Object... params) throws
                             int cnv;
                             while ("-+# ".indexOf(ch) >= 0) {
                                 switch (ch) {
-                                    case '-': left = true; break;
-                                    case '+': plus = true; break;
-                                    case '#': alternate = true; break;
-                                    case ' ': space = true; break;
+                                    case '-':
+                                        left = true;
+                                        break;
+                                    case '+':
+                                        plus = true;
+                                        break;
+                                    case '#':
+                                        alternate = true;
+                                        break;
+                                    case ' ':
+                                        space = true;
+                                        break;
                                 }
                                 ch = str.charAt(index++);
                             }
@@ -473,5 +481,4 @@ private static int toInteger(Object pop) {
             return Integer.parseInt(pop.toString());
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/DiffHelper.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/DiffHelper.java
index 3852f572746ce..93b065395de77 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/DiffHelper.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/DiffHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -25,7 +25,9 @@ public class DiffHelper {
      * which means: delete "Hello", add "Goodbye" and keep " world."
      */
     public enum Operation {
-        DELETE, INSERT, EQUAL
+        DELETE,
+        INSERT,
+        EQUAL
     }
 
     /**
@@ -86,16 +88,13 @@ public static List<Diff> diff(AttributedString text1, AttributedString text2) {
                 && text1.charAt(commonStart) == text2.charAt(commonStart)
                 && text1.styleAt(commonStart).equals(text2.styleAt(commonStart))) {
             if (text1.isHidden(commonStart)) {
-                if (startHiddenRange < 0)
-                    startHiddenRange = commonStart;
-            } else
-                startHiddenRange = -1;
+                if (startHiddenRange < 0) startHiddenRange = commonStart;
+            } else startHiddenRange = -1;
             commonStart++;
         }
         if (startHiddenRange >= 0
-            && ((l1 > commonStart && text1.isHidden(commonStart))
-                || (l2 > commonStart && text2.isHidden(commonStart))))
-            commonStart = startHiddenRange;
+                && ((l1 > commonStart && text1.isHidden(commonStart))
+                        || (l2 > commonStart && text2.isHidden(commonStart)))) commonStart = startHiddenRange;
 
         startHiddenRange = -1;
         int commonEnd = 0;
@@ -103,32 +102,24 @@ public static List<Diff> diff(AttributedString text1, AttributedString text2) {
                 && text1.charAt(l1 - commonEnd - 1) == text2.charAt(l2 - commonEnd - 1)
                 && text1.styleAt(l1 - commonEnd - 1).equals(text2.styleAt(l2 - commonEnd - 1))) {
             if (text1.isHidden(l1 - commonEnd - 1)) {
-                if (startHiddenRange < 0)
-                    startHiddenRange = commonEnd;
-            } else
-                startHiddenRange = -1;
+                if (startHiddenRange < 0) startHiddenRange = commonEnd;
+            } else startHiddenRange = -1;
             commonEnd++;
         }
-        if (startHiddenRange >= 0)
-            commonEnd = startHiddenRange;
+        if (startHiddenRange >= 0) commonEnd = startHiddenRange;
         LinkedList<Diff> diffs = new LinkedList<>();
         if (commonStart > 0) {
-            diffs.add(new Diff(DiffHelper.Operation.EQUAL,
-                    text1.subSequence(0, commonStart)));
+            diffs.add(new Diff(DiffHelper.Operation.EQUAL, text1.subSequence(0, commonStart)));
         }
         if (l2 > commonStart + commonEnd) {
-            diffs.add(new Diff(DiffHelper.Operation.INSERT,
-                    text2.subSequence(commonStart, l2 - commonEnd)));
+            diffs.add(new Diff(DiffHelper.Operation.INSERT, text2.subSequence(commonStart, l2 - commonEnd)));
         }
         if (l1 > commonStart + commonEnd) {
-            diffs.add(new Diff(DiffHelper.Operation.DELETE,
-                    text1.subSequence(commonStart, l1 - commonEnd)));
+            diffs.add(new Diff(DiffHelper.Operation.DELETE, text1.subSequence(commonStart, l1 - commonEnd)));
         }
         if (commonEnd > 0) {
-            diffs.add(new Diff(DiffHelper.Operation.EQUAL,
-                    text1.subSequence(l1 - commonEnd, l1)));
+            diffs.add(new Diff(DiffHelper.Operation.EQUAL, text1.subSequence(l1 - commonEnd, l1)));
         }
         return diffs;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
index aaeab9b71ffe9..557024a121ed2 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -37,8 +37,8 @@ public class Display {
     protected final boolean fullScreen;
     protected List<AttributedString> oldLines = Collections.emptyList();
     protected int cursorPos;
-    private int columns;
-    private int columns1; // columns+1
+    protected int columns;
+    protected int columns1; // columns+1
     protected int rows;
     protected boolean reset;
     protected boolean delayLineWrap;
@@ -49,15 +49,15 @@ public class Display {
     protected final boolean delayedWrapAtEol;
     protected final boolean cursorDownIsNewLine;
 
+    @SuppressWarnings("this-escape")
     public Display(Terminal terminal, boolean fullscreen) {
         this.terminal = terminal;
         this.fullScreen = fullscreen;
 
         this.canScroll = can(Capability.insert_line, Capability.parm_insert_line)
-                            && can(Capability.delete_line, Capability.parm_delete_line);
+                && can(Capability.delete_line, Capability.parm_delete_line);
         this.wrapAtEol = terminal.getBooleanCapability(Capability.auto_right_margin);
-        this.delayedWrapAtEol = this.wrapAtEol
-            && terminal.getBooleanCapability(Capability.eat_newline_glitch);
+        this.delayedWrapAtEol = this.wrapAtEol && terminal.getBooleanCapability(Capability.eat_newline_glitch);
         this.cursorDownIsNewLine = "\n".equals(Curses.tputs(terminal.getStringCapability(Capability.cursor_down)));
     }
 
@@ -69,18 +69,22 @@ public Display(Terminal terminal, boolean fullscreen) {
     public boolean delayLineWrap() {
         return delayLineWrap;
     }
-    public void setDelayLineWrap(boolean v) { delayLineWrap = v; }
+
+    public void setDelayLineWrap(boolean v) {
+        delayLineWrap = v;
+    }
 
     public void resize(int rows, int columns) {
         if (rows == 0 || columns == 0) {
-            columns = Integer.MAX_VALUE - 1;
+            columns = 1;
             rows = 1;
         }
         if (this.rows != rows || this.columns != columns) {
             this.rows = rows;
             this.columns = columns;
             this.columns1 = columns + 1;
-            oldLines = AttributedString.join(AttributedString.EMPTY, oldLines).columnSplitLength(columns, true, delayLineWrap());
+            oldLines = AttributedString.join(AttributedString.EMPTY, oldLines)
+                    .columnSplitLength(columns, true, delayLineWrap());
         }
     }
 
@@ -128,7 +132,8 @@ public void update(List<AttributedString> newLines, int targetCursorPos, boolean
         // If dumb display, get rid of ansi sequences now
         Integer cols = terminal.getNumericCapability(Capability.max_colors);
         if (cols == null || cols < 8) {
-            newLines = newLines.stream().map(s -> new AttributedString(s.toString()))
+            newLines = newLines.stream()
+                    .map(s -> new AttributedString(s.toString()))
                     .collect(Collectors.toList());
         }
 
@@ -138,12 +143,13 @@ public void update(List<AttributedString> newLines, int targetCursorPos, boolean
             int nbFooters = 0;
             // Find common headers and footers
             int l = newLines.size();
-            while (nbHeaders < l
-                   && Objects.equals(newLines.get(nbHeaders), oldLines.get(nbHeaders))) {
+            while (nbHeaders < l && Objects.equals(newLines.get(nbHeaders), oldLines.get(nbHeaders))) {
                 nbHeaders++;
             }
             while (nbFooters < l - nbHeaders - 1
-                    && Objects.equals(newLines.get(newLines.size() - nbFooters - 1), oldLines.get(oldLines.size() - nbFooters - 1))) {
+                    && Objects.equals(
+                            newLines.get(newLines.size() - nbFooters - 1),
+                            oldLines.get(oldLines.size() - nbFooters - 1))) {
                 nbFooters++;
             }
             List<AttributedString> o1 = newLines.subList(nbHeaders, newLines.size() - nbFooters);
@@ -190,18 +196,14 @@ public void update(List<AttributedString> newLines, int targetCursorPos, boolean
         int numLines = Math.min(rows, Math.max(oldLines.size(), newLines.size()));
         boolean wrapNeeded = false;
         while (lineIndex < numLines) {
-            AttributedString oldLine =
-                lineIndex < oldLines.size() ? oldLines.get(lineIndex)
-                : AttributedString.NEWLINE;
-            AttributedString newLine =
-                 lineIndex < newLines.size() ? newLines.get(lineIndex)
-                : AttributedString.NEWLINE;
+            AttributedString oldLine = lineIndex < oldLines.size() ? oldLines.get(lineIndex) : AttributedString.NEWLINE;
+            AttributedString newLine = lineIndex < newLines.size() ? newLines.get(lineIndex) : AttributedString.NEWLINE;
             currentPos = lineIndex * columns1;
             int curCol = currentPos;
             int oldLength = oldLine.length();
             int newLength = newLine.length();
-            boolean oldNL = oldLength > 0 && oldLine.charAt(oldLength-1)=='\n';
-            boolean newNL = newLength > 0 && newLine.charAt(newLength-1)=='\n';
+            boolean oldNL = oldLength > 0 && oldLine.charAt(oldLength - 1) == '\n';
+            boolean newNL = newLength > 0 && newLine.charAt(newLength - 1) == '\n';
             if (oldNL) {
                 oldLength--;
                 oldLine = oldLine.substring(0, oldLength);
@@ -210,9 +212,7 @@ public void update(List<AttributedString> newLines, int targetCursorPos, boolean
                 newLength--;
                 newLine = newLine.substring(0, newLength);
             }
-            if (wrapNeeded
-                && lineIndex == (cursorPos + 1) / columns1
-                && lineIndex < newLines.size()) {
+            if (wrapNeeded && lineIndex == (cursorPos + 1) / columns1 && lineIndex < newLines.size()) {
                 // move from right margin to next line's left margin
                 cursorPos++;
                 if (newLength == 0 || newLine.isHidden(0)) {
@@ -250,8 +250,7 @@ public void update(List<AttributedString> newLines, int targetCursorPos, boolean
                         }
                         break;
                     case INSERT:
-                        if (i <= diffs.size() - 2
-                                && diffs.get(i + 1).operation == DiffHelper.Operation.EQUAL) {
+                        if (i <= diffs.size() - 2 && diffs.get(i + 1).operation == DiffHelper.Operation.EQUAL) {
                             cursorPos = moveVisualCursorTo(currentPos);
                             if (insertChars(width)) {
                                 rawPrint(diff.text);
@@ -282,8 +281,7 @@ public void update(List<AttributedString> newLines, int targetCursorPos, boolean
                         if (currentPos - curCol >= columns) {
                             continue;
                         }
-                        if (i <= diffs.size() - 2
-                                && diffs.get(i + 1).operation == DiffHelper.Operation.EQUAL) {
+                        if (i <= diffs.size() - 2 && diffs.get(i + 1).operation == DiffHelper.Operation.EQUAL) {
                             if (currentPos + diffs.get(i + 1).text.columnLength() < columns) {
                                 moveVisualCursorTo(currentPos);
                                 if (deleteChars(width)) {
@@ -305,25 +303,23 @@ public void update(List<AttributedString> newLines, int targetCursorPos, boolean
                 }
             }
             lineIndex++;
-            boolean newWrap = ! newNL && lineIndex < newLines.size();
-            if (targetCursorPos + 1 == lineIndex * columns1
-                && (newWrap || ! delayLineWrap))
-                targetCursorPos++;
+            boolean newWrap = !newNL && lineIndex < newLines.size();
+            if (targetCursorPos + 1 == lineIndex * columns1 && (newWrap || !delayLineWrap)) targetCursorPos++;
             boolean atRight = (cursorPos - curCol) % columns1 == columns;
             wrapNeeded = false;
             if (this.delayedWrapAtEol) {
-                boolean oldWrap = ! oldNL && lineIndex < oldLines.size();
-                if (newWrap != oldWrap && ! (oldWrap && cleared)) {
-                    moveVisualCursorTo(lineIndex*columns1-1, newLines);
-                    if (newWrap)
-                        wrapNeeded = true;
-                    else
-                        terminal.puts(Capability.clr_eol);
+                boolean oldWrap = !oldNL && lineIndex < oldLines.size();
+                if (newWrap != oldWrap && !(oldWrap && cleared)) {
+                    moveVisualCursorTo(lineIndex * columns1 - 1, newLines);
+                    if (newWrap) wrapNeeded = true;
+                    else terminal.puts(Capability.clr_eol);
                 }
             } else if (atRight) {
                 if (this.wrapAtEol) {
-                    terminal.writer().write(" \b");
-                    cursorPos++;
+                    if (!fullScreen || (fullScreen && lineIndex < numLines)) {
+                        terminal.writer().write(" \b");
+                        cursorPos++;
+                    }
                 } else {
                     terminal.puts(Capability.carriage_return); // CR / not newline.
                     cursorPos = curCol;
@@ -358,8 +354,7 @@ protected boolean deleteChars(int nb) {
     }
 
     protected boolean can(Capability single, Capability multi) {
-        return terminal.getStringCapability(single) != null
-                || terminal.getStringCapability(multi) != null;
+        return terminal.getStringCapability(single) != null || terminal.getStringCapability(multi) != null;
     }
 
     protected boolean perform(Capability single, Capability multi, int nb) {
@@ -405,7 +400,7 @@ private static int[] longestCommon(List<AttributedString> l1, List<AttributedStr
                 }
             }
         }
-        return max != 0 ? new int[] { start1, start2, max } : null;
+        return max != 0 ? new int[] {start1, start2, max} : null;
     }
 
     /*
@@ -413,8 +408,7 @@ private static int[] longestCommon(List<AttributedString> l1, List<AttributedStr
      * We're at the right margin if {@code (cursorPos % columns1) == columns}.
      * This method knows how to move both *from* and *to* the right margin.
      */
-    protected void moveVisualCursorTo(int targetPos,
-                                      List<AttributedString> newLines) {
+    protected void moveVisualCursorTo(int targetPos, List<AttributedString> newLines) {
         if (cursorPos != targetPos) {
             boolean atRight = (targetPos % columns1) == columns;
             moveVisualCursorTo(targetPos - (atRight ? 1 : 0));
@@ -422,12 +416,11 @@ protected void moveVisualCursorTo(int targetPos,
                 // There is no portable way to move to the right margin
                 // except by writing a character in the right-most column.
                 int row = targetPos / columns1;
-                AttributedString lastChar = row >= newLines.size() ? AttributedString.EMPTY
-                    : newLines.get(row).columnSubSequence(columns-1, columns);
-                if (lastChar.length() == 0)
-                    rawPrint((int) ' ');
-                else
-                    rawPrint(lastChar);
+                AttributedString lastChar = row >= newLines.size()
+                        ? AttributedString.EMPTY
+                        : newLines.get(row).columnSubSequence(columns - 1, columns);
+                if (lastChar.length() == 0) rawPrint((int) ' ');
+                else rawPrint(lastChar);
                 cursorPos++;
             }
         }
@@ -499,5 +492,4 @@ void rawPrint(AttributedString str) {
     public int wcwidth(String str) {
         return str != null ? AttributedString.fromAnsi(str).columnLength() : 0;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ExecHelper.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ExecHelper.java
index 9fce26fcf357d..5d3c235661b4c 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ExecHelper.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ExecHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -22,8 +22,7 @@
  */
 public final class ExecHelper {
 
-    private ExecHelper() {
-    }
+    private ExecHelper() {}
 
     public static String exec(boolean redirectInput, final String... cmd) throws IOException {
         Objects.requireNonNull(cmd);
@@ -31,7 +30,7 @@ public static String exec(boolean redirectInput, final String... cmd) throws IOE
             Log.trace("Running: ", cmd);
             ProcessBuilder pb = new ProcessBuilder(cmd);
             if (OSUtils.IS_AIX) {
-                Map<String,String> env = pb.environment();
+                Map<String, String> env = pb.environment();
                 env.put("PATH", "/opt/freeware/bin:" + env.get("PATH"));
                 env.put("LANG", "C");
                 env.put("LC_ALL", "C");
@@ -90,4 +89,3 @@ private static void close(final Closeable... closeables) {
         }
     }
 }
-
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/FastBufferedOutputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/FastBufferedOutputStream.java
new file mode 100644
index 0000000000000..62c29c17f7816
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/FastBufferedOutputStream.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2009-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.utils;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * A simple buffering output stream with no synchronization.
+ */
+public class FastBufferedOutputStream extends FilterOutputStream {
+
+    protected final byte[] buf = new byte[8192];
+    protected int count;
+
+    public FastBufferedOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    @Override
+    public void write(int b) throws IOException {
+        if (count >= buf.length) {
+            flushBuffer();
+        }
+        buf[count++] = (byte) b;
+    }
+
+    @Override
+    public void write(byte b[], int off, int len) throws IOException {
+        if (len >= buf.length) {
+            flushBuffer();
+            out.write(b, off, len);
+            return;
+        }
+        if (len > buf.length - count) {
+            flushBuffer();
+        }
+        System.arraycopy(b, off, buf, count, len);
+        count += len;
+    }
+
+    private void flushBuffer() throws IOException {
+        if (count > 0) {
+            out.write(buf, 0, count);
+            count = 0;
+        }
+    }
+
+    @Override
+    public void flush() throws IOException {
+        flushBuffer();
+        out.flush();
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InfoCmp.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InfoCmp.java
index 23a7607148683..32cf3f56318ab 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InfoCmp.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InfoCmp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -28,476 +28,474 @@ public final class InfoCmp {
 
     private static final Map<String, Object> CAPS = new HashMap<>();
 
-    private InfoCmp() {
-    }
+    private InfoCmp() {}
 
     @SuppressWarnings("unused")
     public enum Capability {
-
-        auto_left_margin,           // auto_left_margin, bw, bw
-        auto_right_margin,          // auto_right_margin, am, am
-        back_color_erase,           // back_color_erase, bce, ut
-        can_change,                 // can_change, ccc, cc
-        ceol_standout_glitch,       // ceol_standout_glitch, xhp, xs
-        col_addr_glitch,            // col_addr_glitch, xhpa, YA
-        cpi_changes_res,            // cpi_changes_res, cpix, YF
-        cr_cancels_micro_mode,      // cr_cancels_micro_mode, crxm, YB
-        dest_tabs_magic_smso,       // dest_tabs_magic_smso, xt, xt
-        eat_newline_glitch,         // eat_newline_glitch, xenl, xn
-        erase_overstrike,           // erase_overstrike, eo, eo
-        generic_type,               // generic_type, gn, gn
-        hard_copy,                  // hard_copy, hc, hc
-        hard_cursor,                // hard_cursor, chts, HC
-        has_meta_key,               // has_meta_key, km, km
-        has_print_wheel,            // has_print_wheel, daisy, YC
-        has_status_line,            // has_status_line, hs, hs
-        hue_lightness_saturation,   // hue_lightness_saturation, hls, hl
-        insert_null_glitch,         // insert_null_glitch, in, in
-        lpi_changes_res,            // lpi_changes_res, lpix, YG
-        memory_above,               // memory_above, da, da
-        memory_below,               // memory_below, db, db
-        move_insert_mode,           // move_insert_mode, mir, mi
-        move_standout_mode,         // move_standout_mode, msgr, ms
-        needs_xon_xoff,             // needs_xon_xoff, nxon, nx
-        no_esc_ctlc,                // no_esc_ctlc, xsb, xb
-        no_pad_char,                // no_pad_char, npc, NP
-        non_dest_scroll_region,     // non_dest_scroll_region, ndscr, ND
-        non_rev_rmcup,              // non_rev_rmcup, nrrmc, NR
-        over_strike,                // over_strike, os, os
-        prtr_silent,                // prtr_silent, mc5i, 5i
-        row_addr_glitch,            // row_addr_glitch, xvpa, YD
-        semi_auto_right_margin,     // semi_auto_right_margin, sam, YE
-        status_line_esc_ok,         // status_line_esc_ok, eslok, es
-        tilde_glitch,               // tilde_glitch, hz, hz
-        transparent_underline,      // transparent_underline, ul, ul
-        xon_xoff,                   // xon_xoff, xon, xo
-        columns,                    // columns, cols, co
-        init_tabs,                  // init_tabs, it, it
-        label_height,               // label_height, lh, lh
-        label_width,                // label_width, lw, lw
-        lines,                      // lines, lines, li
-        lines_of_memory,            // lines_of_memory, lm, lm
-        magic_cookie_glitch,        // magic_cookie_glitch, xmc, sg
-        max_attributes,             // max_attributes, ma, ma
-        max_colors,                 // max_colors, colors, Co
-        max_pairs,                  // max_pairs, pairs, pa
-        maximum_windows,            // maximum_windows, wnum, MW
-        no_color_video,             // no_color_video, ncv, NC
-        num_labels,                 // num_labels, nlab, Nl
-        padding_baud_rate,          // padding_baud_rate, pb, pb
-        virtual_terminal,           // virtual_terminal, vt, vt
-        width_status_line,          // width_status_line, wsl, ws
-        bit_image_entwining,        // bit_image_entwining, bitwin, Yo
-        bit_image_type,             // bit_image_type, bitype, Yp
-        buffer_capacity,            // buffer_capacity, bufsz, Ya
-        buttons,                    // buttons, btns, BT
-        dot_horz_spacing,           // dot_horz_spacing, spinh, Yc
-        dot_vert_spacing,           // dot_vert_spacing, spinv, Yb
-        max_micro_address,          // max_micro_address, maddr, Yd
-        max_micro_jump,             // max_micro_jump, mjump, Ye
-        micro_col_size,             // micro_col_size, mcs, Yf
-        micro_line_size,            // micro_line_size, mls, Yg
-        number_of_pins,             // number_of_pins, npins, Yh
-        output_res_char,            // output_res_char, orc, Yi
-        output_res_horz_inch,       // output_res_horz_inch, orhi, Yk
-        output_res_line,            // output_res_line, orl, Yj
-        output_res_vert_inch,       // output_res_vert_inch, orvi, Yl
-        print_rate,                 // print_rate, cps, Ym
-        wide_char_size,             // wide_char_size, widcs, Yn
-        acs_chars,                  // acs_chars, acsc, ac
-        back_tab,                   // back_tab, cbt, bt
-        bell,                       // bell, bel, bl
-        carriage_return,            // carriage_return, cr, cr
-        change_char_pitch,          // change_char_pitch, cpi, ZA
-        change_line_pitch,          // change_line_pitch, lpi, ZB
-        change_res_horz,            // change_res_horz, chr, ZC
-        change_res_vert,            // change_res_vert, cvr, ZD
-        change_scroll_region,       // change_scroll_region, csr, cs
-        char_padding,               // char_padding, rmp, rP
-        clear_all_tabs,             // clear_all_tabs, tbc, ct
-        clear_margins,              // clear_margins, mgc, MC
-        clear_screen,               // clear_screen, clear, cl
-        clr_bol,                    // clr_bol, el1, cb
-        clr_eol,                    // clr_eol, el, ce
-        clr_eos,                    // clr_eos, ed, cd
-        column_address,             // column_address, hpa, ch
-        command_character,          // command_character, cmdch, CC
-        create_window,              // create_window, cwin, CW
-        cursor_address,             // cursor_address, cup, cm
-        cursor_down,                // cursor_down, cud1, do
-        cursor_home,                // cursor_home, home, ho
-        cursor_invisible,           // cursor_invisible, civis, vi
-        cursor_left,                // cursor_left, cub1, le
-        cursor_mem_address,         // cursor_mem_address, mrcup, CM
-        cursor_normal,              // cursor_normal, cnorm, ve
-        cursor_right,               // cursor_right, cuf1, nd
-        cursor_to_ll,               // cursor_to_ll, ll, ll
-        cursor_up,                  // cursor_up, cuu1, up
-        cursor_visible,             // cursor_visible, cvvis, vs
-        define_char,                // define_char, defc, ZE
-        delete_character,           // delete_character, dch1, dc
-        delete_line,                // delete_line, dl1, dl
-        dial_phone,                 // dial_phone, dial, DI
-        dis_status_line,            // dis_status_line, dsl, ds
-        display_clock,              // display_clock, dclk, DK
-        down_half_line,             // down_half_line, hd, hd
-        ena_acs,                    // ena_acs, enacs, eA
-        enter_alt_charset_mode,     // enter_alt_charset_mode, smacs, as
-        enter_am_mode,              // enter_am_mode, smam, SA
-        enter_blink_mode,           // enter_blink_mode, blink, mb
-        enter_bold_mode,            // enter_bold_mode, bold, md
-        enter_ca_mode,              // enter_ca_mode, smcup, ti
-        enter_delete_mode,          // enter_delete_mode, smdc, dm
-        enter_dim_mode,             // enter_dim_mode, dim, mh
-        enter_doublewide_mode,      // enter_doublewide_mode, swidm, ZF
-        enter_draft_quality,        // enter_draft_quality, sdrfq, ZG
-        enter_insert_mode,          // enter_insert_mode, smir, im
-        enter_italics_mode,         // enter_italics_mode, sitm, ZH
-        enter_leftward_mode,        // enter_leftward_mode, slm, ZI
-        enter_micro_mode,           // enter_micro_mode, smicm, ZJ
-        enter_near_letter_quality,  // enter_near_letter_quality, snlq, ZK
-        enter_normal_quality,       // enter_normal_quality, snrmq, ZL
-        enter_protected_mode,       // enter_protected_mode, prot, mp
-        enter_reverse_mode,         // enter_reverse_mode, rev, mr
-        enter_secure_mode,          // enter_secure_mode, invis, mk
-        enter_shadow_mode,          // enter_shadow_mode, sshm, ZM
-        enter_standout_mode,        // enter_standout_mode, smso, so
-        enter_subscript_mode,       // enter_subscript_mode, ssubm, ZN
-        enter_superscript_mode,     // enter_superscript_mode, ssupm, ZO
-        enter_underline_mode,       // enter_underline_mode, smul, us
-        enter_upward_mode,          // enter_upward_mode, sum, ZP
-        enter_xon_mode,             // enter_xon_mode, smxon, SX
-        erase_chars,                // erase_chars, ech, ec
-        exit_alt_charset_mode,      // exit_alt_charset_mode, rmacs, ae
-        exit_am_mode,               // exit_am_mode, rmam, RA
-        exit_attribute_mode,        // exit_attribute_mode, sgr0, me
-        exit_ca_mode,               // exit_ca_mode, rmcup, te
-        exit_delete_mode,           // exit_delete_mode, rmdc, ed
-        exit_doublewide_mode,       // exit_doublewide_mode, rwidm, ZQ
-        exit_insert_mode,           // exit_insert_mode, rmir, ei
-        exit_italics_mode,          // exit_italics_mode, ritm, ZR
-        exit_leftward_mode,         // exit_leftward_mode, rlm, ZS
-        exit_micro_mode,            // exit_micro_mode, rmicm, ZT
-        exit_shadow_mode,           // exit_shadow_mode, rshm, ZU
-        exit_standout_mode,         // exit_standout_mode, rmso, se
-        exit_subscript_mode,        // exit_subscript_mode, rsubm, ZV
-        exit_superscript_mode,      // exit_superscript_mode, rsupm, ZW
-        exit_underline_mode,        // exit_underline_mode, rmul, ue
-        exit_upward_mode,           // exit_upward_mode, rum, ZX
-        exit_xon_mode,              // exit_xon_mode, rmxon, RX
-        fixed_pause,                // fixed_pause, pause, PA
-        flash_hook,                 // flash_hook, hook, fh
-        flash_screen,               // flash_screen, flash, vb
-        form_feed,                  // form_feed, ff, ff
-        from_status_line,           // from_status_line, fsl, fs
-        goto_window,                // goto_window, wingo, WG
-        hangup,                     // hangup, hup, HU
-        init_1string,               // init_1string, is1, i1
-        init_2string,               // init_2string, is2, is
-        init_3string,               // init_3string, is3, i3
-        init_file,                  // init_file, if, if
-        init_prog,                  // init_prog, iprog, iP
-        initialize_color,           // initialize_color, initc, Ic
-        initialize_pair,            // initialize_pair, initp, Ip
-        insert_character,           // insert_character, ich1, ic
-        insert_line,                // insert_line, il1, al
-        insert_padding,             // insert_padding, ip, ip
-        key_a1,                     // key_a1, ka1, K1
-        key_a3,                     // key_a3, ka3, K3
-        key_b2,                     // key_b2, kb2, K2
-        key_backspace,              // key_backspace, kbs, kb
-        key_beg,                    // key_beg, kbeg, @1
-        key_btab,                   // key_btab, kcbt, kB
-        key_c1,                     // key_c1, kc1, K4
-        key_c3,                     // key_c3, kc3, K5
-        key_cancel,                 // key_cancel, kcan, @2
-        key_catab,                  // key_catab, ktbc, ka
-        key_clear,                  // key_clear, kclr, kC
-        key_close,                  // key_close, kclo, @3
-        key_command,                // key_command, kcmd, @4
-        key_copy,                   // key_copy, kcpy, @5
-        key_create,                 // key_create, kcrt, @6
-        key_ctab,                   // key_ctab, kctab, kt
-        key_dc,                     // key_dc, kdch1, kD
-        key_dl,                     // key_dl, kdl1, kL
-        key_down,                   // key_down, kcud1, kd
-        key_eic,                    // key_eic, krmir, kM
-        key_end,                    // key_end, kend, @7
-        key_enter,                  // key_enter, kent, @8
-        key_eol,                    // key_eol, kel, kE
-        key_eos,                    // key_eos, ked, kS
-        key_exit,                   // key_exit, kext, @9
-        key_f0,                     // key_f0, kf0, k0
-        key_f1,                     // key_f1, kf1, k1
-        key_f10,                    // key_f10, kf10, k;
-        key_f11,                    // key_f11, kf11, F1
-        key_f12,                    // key_f12, kf12, F2
-        key_f13,                    // key_f13, kf13, F3
-        key_f14,                    // key_f14, kf14, F4
-        key_f15,                    // key_f15, kf15, F5
-        key_f16,                    // key_f16, kf16, F6
-        key_f17,                    // key_f17, kf17, F7
-        key_f18,                    // key_f18, kf18, F8
-        key_f19,                    // key_f19, kf19, F9
-        key_f2,                     // key_f2, kf2, k2
-        key_f20,                    // key_f20, kf20, FA
-        key_f21,                    // key_f21, kf21, FB
-        key_f22,                    // key_f22, kf22, FC
-        key_f23,                    // key_f23, kf23, FD
-        key_f24,                    // key_f24, kf24, FE
-        key_f25,                    // key_f25, kf25, FF
-        key_f26,                    // key_f26, kf26, FG
-        key_f27,                    // key_f27, kf27, FH
-        key_f28,                    // key_f28, kf28, FI
-        key_f29,                    // key_f29, kf29, FJ
-        key_f3,                     // key_f3, kf3, k3
-        key_f30,                    // key_f30, kf30, FK
-        key_f31,                    // key_f31, kf31, FL
-        key_f32,                    // key_f32, kf32, FM
-        key_f33,                    // key_f33, kf33, FN
-        key_f34,                    // key_f34, kf34, FO
-        key_f35,                    // key_f35, kf35, FP
-        key_f36,                    // key_f36, kf36, FQ
-        key_f37,                    // key_f37, kf37, FR
-        key_f38,                    // key_f38, kf38, FS
-        key_f39,                    // key_f39, kf39, FT
-        key_f4,                     // key_f4, kf4, k4
-        key_f40,                    // key_f40, kf40, FU
-        key_f41,                    // key_f41, kf41, FV
-        key_f42,                    // key_f42, kf42, FW
-        key_f43,                    // key_f43, kf43, FX
-        key_f44,                    // key_f44, kf44, FY
-        key_f45,                    // key_f45, kf45, FZ
-        key_f46,                    // key_f46, kf46, Fa
-        key_f47,                    // key_f47, kf47, Fb
-        key_f48,                    // key_f48, kf48, Fc
-        key_f49,                    // key_f49, kf49, Fd
-        key_f5,                     // key_f5, kf5, k5
-        key_f50,                    // key_f50, kf50, Fe
-        key_f51,                    // key_f51, kf51, Ff
-        key_f52,                    // key_f52, kf52, Fg
-        key_f53,                    // key_f53, kf53, Fh
-        key_f54,                    // key_f54, kf54, Fi
-        key_f55,                    // key_f55, kf55, Fj
-        key_f56,                    // key_f56, kf56, Fk
-        key_f57,                    // key_f57, kf57, Fl
-        key_f58,                    // key_f58, kf58, Fm
-        key_f59,                    // key_f59, kf59, Fn
-        key_f6,                     // key_f6, kf6, k6
-        key_f60,                    // key_f60, kf60, Fo
-        key_f61,                    // key_f61, kf61, Fp
-        key_f62,                    // key_f62, kf62, Fq
-        key_f63,                    // key_f63, kf63, Fr
-        key_f7,                     // key_f7, kf7, k7
-        key_f8,                     // key_f8, kf8, k8
-        key_f9,                     // key_f9, kf9, k9
-        key_find,                   // key_find, kfnd, @0
-        key_help,                   // key_help, khlp, %1
-        key_home,                   // key_home, khome, kh
-        key_ic,                     // key_ic, kich1, kI
-        key_il,                     // key_il, kil1, kA
-        key_left,                   // key_left, kcub1, kl
-        key_ll,                     // key_ll, kll, kH
-        key_mark,                   // key_mark, kmrk, %2
-        key_message,                // key_message, kmsg, %3
-        key_move,                   // key_move, kmov, %4
-        key_next,                   // key_next, knxt, %5
-        key_npage,                  // key_npage, knp, kN
-        key_open,                   // key_open, kopn, %6
-        key_options,                // key_options, kopt, %7
-        key_ppage,                  // key_ppage, kpp, kP
-        key_previous,               // key_previous, kprv, %8
-        key_print,                  // key_print, kprt, %9
-        key_redo,                   // key_redo, krdo, %0
-        key_reference,              // key_reference, kref, &1
-        key_refresh,                // key_refresh, krfr, &2
-        key_replace,                // key_replace, krpl, &3
-        key_restart,                // key_restart, krst, &4
-        key_resume,                 // key_resume, kres, &5
-        key_right,                  // key_right, kcuf1, kr
-        key_save,                   // key_save, ksav, &6
-        key_sbeg,                   // key_sbeg, kBEG, &9
-        key_scancel,                // key_scancel, kCAN, &0
-        key_scommand,               // key_scommand, kCMD, *1
-        key_scopy,                  // key_scopy, kCPY, *2
-        key_screate,                // key_screate, kCRT, *3
-        key_sdc,                    // key_sdc, kDC, *4
-        key_sdl,                    // key_sdl, kDL, *5
-        key_select,                 // key_select, kslt, *6
-        key_send,                   // key_send, kEND, *7
-        key_seol,                   // key_seol, kEOL, *8
-        key_sexit,                  // key_sexit, kEXT, *9
-        key_sf,                     // key_sf, kind, kF
-        key_sfind,                  // key_sfind, kFND, *0
-        key_shelp,                  // key_shelp, kHLP, #1
-        key_shome,                  // key_shome, kHOM, #2
-        key_sic,                    // key_sic, kIC, #3
-        key_sleft,                  // key_sleft, kLFT, #4
-        key_smessage,               // key_smessage, kMSG, %a
-        key_smove,                  // key_smove, kMOV, %b
-        key_snext,                  // key_snext, kNXT, %c
-        key_soptions,               // key_soptions, kOPT, %d
-        key_sprevious,              // key_sprevious, kPRV, %e
-        key_sprint,                 // key_sprint, kPRT, %f
-        key_sr,                     // key_sr, kri, kR
-        key_sredo,                  // key_sredo, kRDO, %g
-        key_sreplace,               // key_sreplace, kRPL, %h
-        key_sright,                 // key_sright, kRIT, %i
-        key_srsume,                 // key_srsume, kRES, %j
-        key_ssave,                  // key_ssave, kSAV, !1
-        key_ssuspend,               // key_ssuspend, kSPD, !2
-        key_stab,                   // key_stab, khts, kT
-        key_sundo,                  // key_sundo, kUND, !3
-        key_suspend,                // key_suspend, kspd, &7
-        key_undo,                   // key_undo, kund, &8
-        key_up,                     // key_up, kcuu1, ku
-        keypad_local,               // keypad_local, rmkx, ke
-        keypad_xmit,                // keypad_xmit, smkx, ks
-        lab_f0,                     // lab_f0, lf0, l0
-        lab_f1,                     // lab_f1, lf1, l1
-        lab_f10,                    // lab_f10, lf10, la
-        lab_f2,                     // lab_f2, lf2, l2
-        lab_f3,                     // lab_f3, lf3, l3
-        lab_f4,                     // lab_f4, lf4, l4
-        lab_f5,                     // lab_f5, lf5, l5
-        lab_f6,                     // lab_f6, lf6, l6
-        lab_f7,                     // lab_f7, lf7, l7
-        lab_f8,                     // lab_f8, lf8, l8
-        lab_f9,                     // lab_f9, lf9, l9
-        label_format,               // label_format, fln, Lf
-        label_off,                  // label_off, rmln, LF
-        label_on,                   // label_on, smln, LO
-        meta_off,                   // meta_off, rmm, mo
-        meta_on,                    // meta_on, smm, mm
-        micro_column_address,       // micro_column_address, mhpa, ZY
-        micro_down,                 // micro_down, mcud1, ZZ
-        micro_left,                 // micro_left, mcub1, Za
-        micro_right,                // micro_right, mcuf1, Zb
-        micro_row_address,          // micro_row_address, mvpa, Zc
-        micro_up,                   // micro_up, mcuu1, Zd
-        newline,                    // newline, nel, nw
-        order_of_pins,              // order_of_pins, porder, Ze
-        orig_colors,                // orig_colors, oc, oc
-        orig_pair,                  // orig_pair, op, op
-        pad_char,                   // pad_char, pad, pc
-        parm_dch,                   // parm_dch, dch, DC
-        parm_delete_line,           // parm_delete_line, dl, DL
-        parm_down_cursor,           // parm_down_cursor, cud, DO
-        parm_down_micro,            // parm_down_micro, mcud, Zf
-        parm_ich,                   // parm_ich, ich, IC
-        parm_index,                 // parm_index, indn, SF
-        parm_insert_line,           // parm_insert_line, il, AL
-        parm_left_cursor,           // parm_left_cursor, cub, LE
-        parm_left_micro,            // parm_left_micro, mcub, Zg
-        parm_right_cursor,          // parm_right_cursor, cuf, RI
-        parm_right_micro,           // parm_right_micro, mcuf, Zh
-        parm_rindex,                // parm_rindex, rin, SR
-        parm_up_cursor,             // parm_up_cursor, cuu, UP
-        parm_up_micro,              // parm_up_micro, mcuu, Zi
-        pkey_key,                   // pkey_key, pfkey, pk
-        pkey_local,                 // pkey_local, pfloc, pl
-        pkey_xmit,                  // pkey_xmit, pfx, px
-        plab_norm,                  // plab_norm, pln, pn
-        print_screen,               // print_screen, mc0, ps
-        prtr_non,                   // prtr_non, mc5p, pO
-        prtr_off,                   // prtr_off, mc4, pf
-        prtr_on,                    // prtr_on, mc5, po
-        pulse,                      // pulse, pulse, PU
-        quick_dial,                 // quick_dial, qdial, QD
-        remove_clock,               // remove_clock, rmclk, RC
-        repeat_char,                // repeat_char, rep, rp
-        req_for_input,              // req_for_input, rfi, RF
-        reset_1string,              // reset_1string, rs1, r1
-        reset_2string,              // reset_2string, rs2, r2
-        reset_3string,              // reset_3string, rs3, r3
-        reset_file,                 // reset_file, rf, rf
-        restore_cursor,             // restore_cursor, rc, rc
-        row_address,                // row_address, vpa, cv
-        save_cursor,                // save_cursor, sc, sc
-        scroll_forward,             // scroll_forward, ind, sf
-        scroll_reverse,             // scroll_reverse, ri, sr
-        select_char_set,            // select_char_set, scs, Zj
-        set_attributes,             // set_attributes, sgr, sa
-        set_background,             // set_background, setb, Sb
-        set_bottom_margin,          // set_bottom_margin, smgb, Zk
-        set_bottom_margin_parm,     // set_bottom_margin_parm, smgbp, Zl
-        set_clock,                  // set_clock, sclk, SC
-        set_color_pair,             // set_color_pair, scp, sp
-        set_foreground,             // set_foreground, setf, Sf
-        set_left_margin,            // set_left_margin, smgl, ML
-        set_left_margin_parm,       // set_left_margin_parm, smglp, Zm
-        set_right_margin,           // set_right_margin, smgr, MR
-        set_right_margin_parm,      // set_right_margin_parm, smgrp, Zn
-        set_tab,                    // set_tab, hts, st
-        set_top_margin,             // set_top_margin, smgt, Zo
-        set_top_margin_parm,        // set_top_margin_parm, smgtp, Zp
-        set_window,                 // set_window, wind, wi
-        start_bit_image,            // start_bit_image, sbim, Zq
-        start_char_set_def,         // start_char_set_def, scsd, Zr
-        stop_bit_image,             // stop_bit_image, rbim, Zs
-        stop_char_set_def,          // stop_char_set_def, rcsd, Zt
-        subscript_characters,       // subscript_characters, subcs, Zu
-        superscript_characters,     // superscript_characters, supcs, Zv
-        tab,                        // tab, ht, ta
-        these_cause_cr,             // these_cause_cr, docr, Zw
-        to_status_line,             // to_status_line, tsl, ts
-        tone,                       // tone, tone, TO
-        underline_char,             // underline_char, uc, uc
-        up_half_line,               // up_half_line, hu, hu
-        user0,                      // user0, u0, u0
-        user1,                      // user1, u1, u1
-        user2,                      // user2, u2, u2
-        user3,                      // user3, u3, u3
-        user4,                      // user4, u4, u4
-        user5,                      // user5, u5, u5
-        user6,                      // user6, u6, u6
-        user7,                      // user7, u7, u7
-        user8,                      // user8, u8, u8
-        user9,                      // user9, u9, u9
-        wait_tone,                  // wait_tone, wait, WA
-        xoff_character,             // xoff_character, xoffc, XF
-        xon_character,              // xon_character, xonc, XN
-        zero_motion,                // zero_motion, zerom, Zx
-        alt_scancode_esc,           // alt_scancode_esc, scesa, S8
-        bit_image_carriage_return,  // bit_image_carriage_return, bicr, Yv
-        bit_image_newline,          // bit_image_newline, binel, Zz
-        bit_image_repeat,           // bit_image_repeat, birep, Xy
-        char_set_names,             // char_set_names, csnm, Zy
-        code_set_init,              // code_set_init, csin, ci
-        color_names,                // color_names, colornm, Yw
-        define_bit_image_region,    // define_bit_image_region, defbi, Yx
-        device_type,                // device_type, devt, dv
-        display_pc_char,            // display_pc_char, dispc, S1
-        end_bit_image_region,       // end_bit_image_region, endbi, Yy
-        enter_pc_charset_mode,      // enter_pc_charset_mode, smpch, S2
-        enter_scancode_mode,        // enter_scancode_mode, smsc, S4
-        exit_pc_charset_mode,       // exit_pc_charset_mode, rmpch, S3
-        exit_scancode_mode,         // exit_scancode_mode, rmsc, S5
-        get_mouse,                  // get_mouse, getm, Gm
-        key_mouse,                  // key_mouse, kmous, Km
-        mouse_info,                 // mouse_info, minfo, Mi
-        pc_term_options,            // pc_term_options, pctrm, S6
-        pkey_plab,                  // pkey_plab, pfxl, xl
-        req_mouse_pos,              // req_mouse_pos, reqmp, RQ
-        scancode_escape,            // scancode_escape, scesc, S7
-        set0_des_seq,               // set0_des_seq, s0ds, s0
-        set1_des_seq,               // set1_des_seq, s1ds, s1
-        set2_des_seq,               // set2_des_seq, s2ds, s2
-        set3_des_seq,               // set3_des_seq, s3ds, s3
-        set_a_background,           // set_a_background, setab, AB
-        set_a_foreground,           // set_a_foreground, setaf, AF
-        set_color_band,             // set_color_band, setcolor, Yz
-        set_lr_margin,              // set_lr_margin, smglr, ML
-        set_page_length,            // set_page_length, slines, YZ
-        set_tb_margin,              // set_tb_margin, smgtb, MT
-        enter_horizontal_hl_mode,   // enter_horizontal_hl_mode, ehhlm, Xh
-        enter_left_hl_mode,         // enter_left_hl_mode, elhlm, Xl
-        enter_low_hl_mode,          // enter_low_hl_mode, elohlm, Xo
-        enter_right_hl_mode,        // enter_right_hl_mode, erhlm, Xr
-        enter_top_hl_mode,          // enter_top_hl_mode, ethlm, Xt
-        enter_vertical_hl_mode,     // enter_vertical_hl_mode, evhlm, Xv
-        set_a_attributes,           // set_a_attributes, sgr1, sA
-        set_pglen_inch,             // set_pglen_inch, slength, sL)
+        auto_left_margin, // auto_left_margin, bw, bw
+        auto_right_margin, // auto_right_margin, am, am
+        back_color_erase, // back_color_erase, bce, ut
+        can_change, // can_change, ccc, cc
+        ceol_standout_glitch, // ceol_standout_glitch, xhp, xs
+        col_addr_glitch, // col_addr_glitch, xhpa, YA
+        cpi_changes_res, // cpi_changes_res, cpix, YF
+        cr_cancels_micro_mode, // cr_cancels_micro_mode, crxm, YB
+        dest_tabs_magic_smso, // dest_tabs_magic_smso, xt, xt
+        eat_newline_glitch, // eat_newline_glitch, xenl, xn
+        erase_overstrike, // erase_overstrike, eo, eo
+        generic_type, // generic_type, gn, gn
+        hard_copy, // hard_copy, hc, hc
+        hard_cursor, // hard_cursor, chts, HC
+        has_meta_key, // has_meta_key, km, km
+        has_print_wheel, // has_print_wheel, daisy, YC
+        has_status_line, // has_status_line, hs, hs
+        hue_lightness_saturation, // hue_lightness_saturation, hls, hl
+        insert_null_glitch, // insert_null_glitch, in, in
+        lpi_changes_res, // lpi_changes_res, lpix, YG
+        memory_above, // memory_above, da, da
+        memory_below, // memory_below, db, db
+        move_insert_mode, // move_insert_mode, mir, mi
+        move_standout_mode, // move_standout_mode, msgr, ms
+        needs_xon_xoff, // needs_xon_xoff, nxon, nx
+        no_esc_ctlc, // no_esc_ctlc, xsb, xb
+        no_pad_char, // no_pad_char, npc, NP
+        non_dest_scroll_region, // non_dest_scroll_region, ndscr, ND
+        non_rev_rmcup, // non_rev_rmcup, nrrmc, NR
+        over_strike, // over_strike, os, os
+        prtr_silent, // prtr_silent, mc5i, 5i
+        row_addr_glitch, // row_addr_glitch, xvpa, YD
+        semi_auto_right_margin, // semi_auto_right_margin, sam, YE
+        status_line_esc_ok, // status_line_esc_ok, eslok, es
+        tilde_glitch, // tilde_glitch, hz, hz
+        transparent_underline, // transparent_underline, ul, ul
+        xon_xoff, // xon_xoff, xon, xo
+        columns, // columns, cols, co
+        init_tabs, // init_tabs, it, it
+        label_height, // label_height, lh, lh
+        label_width, // label_width, lw, lw
+        lines, // lines, lines, li
+        lines_of_memory, // lines_of_memory, lm, lm
+        magic_cookie_glitch, // magic_cookie_glitch, xmc, sg
+        max_attributes, // max_attributes, ma, ma
+        max_colors, // max_colors, colors, Co
+        max_pairs, // max_pairs, pairs, pa
+        maximum_windows, // maximum_windows, wnum, MW
+        no_color_video, // no_color_video, ncv, NC
+        num_labels, // num_labels, nlab, Nl
+        padding_baud_rate, // padding_baud_rate, pb, pb
+        virtual_terminal, // virtual_terminal, vt, vt
+        width_status_line, // width_status_line, wsl, ws
+        bit_image_entwining, // bit_image_entwining, bitwin, Yo
+        bit_image_type, // bit_image_type, bitype, Yp
+        buffer_capacity, // buffer_capacity, bufsz, Ya
+        buttons, // buttons, btns, BT
+        dot_horz_spacing, // dot_horz_spacing, spinh, Yc
+        dot_vert_spacing, // dot_vert_spacing, spinv, Yb
+        max_micro_address, // max_micro_address, maddr, Yd
+        max_micro_jump, // max_micro_jump, mjump, Ye
+        micro_col_size, // micro_col_size, mcs, Yf
+        micro_line_size, // micro_line_size, mls, Yg
+        number_of_pins, // number_of_pins, npins, Yh
+        output_res_char, // output_res_char, orc, Yi
+        output_res_horz_inch, // output_res_horz_inch, orhi, Yk
+        output_res_line, // output_res_line, orl, Yj
+        output_res_vert_inch, // output_res_vert_inch, orvi, Yl
+        print_rate, // print_rate, cps, Ym
+        wide_char_size, // wide_char_size, widcs, Yn
+        acs_chars, // acs_chars, acsc, ac
+        back_tab, // back_tab, cbt, bt
+        bell, // bell, bel, bl
+        carriage_return, // carriage_return, cr, cr
+        change_char_pitch, // change_char_pitch, cpi, ZA
+        change_line_pitch, // change_line_pitch, lpi, ZB
+        change_res_horz, // change_res_horz, chr, ZC
+        change_res_vert, // change_res_vert, cvr, ZD
+        change_scroll_region, // change_scroll_region, csr, cs
+        char_padding, // char_padding, rmp, rP
+        clear_all_tabs, // clear_all_tabs, tbc, ct
+        clear_margins, // clear_margins, mgc, MC
+        clear_screen, // clear_screen, clear, cl
+        clr_bol, // clr_bol, el1, cb
+        clr_eol, // clr_eol, el, ce
+        clr_eos, // clr_eos, ed, cd
+        column_address, // column_address, hpa, ch
+        command_character, // command_character, cmdch, CC
+        create_window, // create_window, cwin, CW
+        cursor_address, // cursor_address, cup, cm
+        cursor_down, // cursor_down, cud1, do
+        cursor_home, // cursor_home, home, ho
+        cursor_invisible, // cursor_invisible, civis, vi
+        cursor_left, // cursor_left, cub1, le
+        cursor_mem_address, // cursor_mem_address, mrcup, CM
+        cursor_normal, // cursor_normal, cnorm, ve
+        cursor_right, // cursor_right, cuf1, nd
+        cursor_to_ll, // cursor_to_ll, ll, ll
+        cursor_up, // cursor_up, cuu1, up
+        cursor_visible, // cursor_visible, cvvis, vs
+        define_char, // define_char, defc, ZE
+        delete_character, // delete_character, dch1, dc
+        delete_line, // delete_line, dl1, dl
+        dial_phone, // dial_phone, dial, DI
+        dis_status_line, // dis_status_line, dsl, ds
+        display_clock, // display_clock, dclk, DK
+        down_half_line, // down_half_line, hd, hd
+        ena_acs, // ena_acs, enacs, eA
+        enter_alt_charset_mode, // enter_alt_charset_mode, smacs, as
+        enter_am_mode, // enter_am_mode, smam, SA
+        enter_blink_mode, // enter_blink_mode, blink, mb
+        enter_bold_mode, // enter_bold_mode, bold, md
+        enter_ca_mode, // enter_ca_mode, smcup, ti
+        enter_delete_mode, // enter_delete_mode, smdc, dm
+        enter_dim_mode, // enter_dim_mode, dim, mh
+        enter_doublewide_mode, // enter_doublewide_mode, swidm, ZF
+        enter_draft_quality, // enter_draft_quality, sdrfq, ZG
+        enter_insert_mode, // enter_insert_mode, smir, im
+        enter_italics_mode, // enter_italics_mode, sitm, ZH
+        enter_leftward_mode, // enter_leftward_mode, slm, ZI
+        enter_micro_mode, // enter_micro_mode, smicm, ZJ
+        enter_near_letter_quality, // enter_near_letter_quality, snlq, ZK
+        enter_normal_quality, // enter_normal_quality, snrmq, ZL
+        enter_protected_mode, // enter_protected_mode, prot, mp
+        enter_reverse_mode, // enter_reverse_mode, rev, mr
+        enter_secure_mode, // enter_secure_mode, invis, mk
+        enter_shadow_mode, // enter_shadow_mode, sshm, ZM
+        enter_standout_mode, // enter_standout_mode, smso, so
+        enter_subscript_mode, // enter_subscript_mode, ssubm, ZN
+        enter_superscript_mode, // enter_superscript_mode, ssupm, ZO
+        enter_underline_mode, // enter_underline_mode, smul, us
+        enter_upward_mode, // enter_upward_mode, sum, ZP
+        enter_xon_mode, // enter_xon_mode, smxon, SX
+        erase_chars, // erase_chars, ech, ec
+        exit_alt_charset_mode, // exit_alt_charset_mode, rmacs, ae
+        exit_am_mode, // exit_am_mode, rmam, RA
+        exit_attribute_mode, // exit_attribute_mode, sgr0, me
+        exit_ca_mode, // exit_ca_mode, rmcup, te
+        exit_delete_mode, // exit_delete_mode, rmdc, ed
+        exit_doublewide_mode, // exit_doublewide_mode, rwidm, ZQ
+        exit_insert_mode, // exit_insert_mode, rmir, ei
+        exit_italics_mode, // exit_italics_mode, ritm, ZR
+        exit_leftward_mode, // exit_leftward_mode, rlm, ZS
+        exit_micro_mode, // exit_micro_mode, rmicm, ZT
+        exit_shadow_mode, // exit_shadow_mode, rshm, ZU
+        exit_standout_mode, // exit_standout_mode, rmso, se
+        exit_subscript_mode, // exit_subscript_mode, rsubm, ZV
+        exit_superscript_mode, // exit_superscript_mode, rsupm, ZW
+        exit_underline_mode, // exit_underline_mode, rmul, ue
+        exit_upward_mode, // exit_upward_mode, rum, ZX
+        exit_xon_mode, // exit_xon_mode, rmxon, RX
+        fixed_pause, // fixed_pause, pause, PA
+        flash_hook, // flash_hook, hook, fh
+        flash_screen, // flash_screen, flash, vb
+        form_feed, // form_feed, ff, ff
+        from_status_line, // from_status_line, fsl, fs
+        goto_window, // goto_window, wingo, WG
+        hangup, // hangup, hup, HU
+        init_1string, // init_1string, is1, i1
+        init_2string, // init_2string, is2, is
+        init_3string, // init_3string, is3, i3
+        init_file, // init_file, if, if
+        init_prog, // init_prog, iprog, iP
+        initialize_color, // initialize_color, initc, Ic
+        initialize_pair, // initialize_pair, initp, Ip
+        insert_character, // insert_character, ich1, ic
+        insert_line, // insert_line, il1, al
+        insert_padding, // insert_padding, ip, ip
+        key_a1, // key_a1, ka1, K1
+        key_a3, // key_a3, ka3, K3
+        key_b2, // key_b2, kb2, K2
+        key_backspace, // key_backspace, kbs, kb
+        key_beg, // key_beg, kbeg, @1
+        key_btab, // key_btab, kcbt, kB
+        key_c1, // key_c1, kc1, K4
+        key_c3, // key_c3, kc3, K5
+        key_cancel, // key_cancel, kcan, @2
+        key_catab, // key_catab, ktbc, ka
+        key_clear, // key_clear, kclr, kC
+        key_close, // key_close, kclo, @3
+        key_command, // key_command, kcmd, @4
+        key_copy, // key_copy, kcpy, @5
+        key_create, // key_create, kcrt, @6
+        key_ctab, // key_ctab, kctab, kt
+        key_dc, // key_dc, kdch1, kD
+        key_dl, // key_dl, kdl1, kL
+        key_down, // key_down, kcud1, kd
+        key_eic, // key_eic, krmir, kM
+        key_end, // key_end, kend, @7
+        key_enter, // key_enter, kent, @8
+        key_eol, // key_eol, kel, kE
+        key_eos, // key_eos, ked, kS
+        key_exit, // key_exit, kext, @9
+        key_f0, // key_f0, kf0, k0
+        key_f1, // key_f1, kf1, k1
+        key_f10, // key_f10, kf10, k;
+        key_f11, // key_f11, kf11, F1
+        key_f12, // key_f12, kf12, F2
+        key_f13, // key_f13, kf13, F3
+        key_f14, // key_f14, kf14, F4
+        key_f15, // key_f15, kf15, F5
+        key_f16, // key_f16, kf16, F6
+        key_f17, // key_f17, kf17, F7
+        key_f18, // key_f18, kf18, F8
+        key_f19, // key_f19, kf19, F9
+        key_f2, // key_f2, kf2, k2
+        key_f20, // key_f20, kf20, FA
+        key_f21, // key_f21, kf21, FB
+        key_f22, // key_f22, kf22, FC
+        key_f23, // key_f23, kf23, FD
+        key_f24, // key_f24, kf24, FE
+        key_f25, // key_f25, kf25, FF
+        key_f26, // key_f26, kf26, FG
+        key_f27, // key_f27, kf27, FH
+        key_f28, // key_f28, kf28, FI
+        key_f29, // key_f29, kf29, FJ
+        key_f3, // key_f3, kf3, k3
+        key_f30, // key_f30, kf30, FK
+        key_f31, // key_f31, kf31, FL
+        key_f32, // key_f32, kf32, FM
+        key_f33, // key_f33, kf33, FN
+        key_f34, // key_f34, kf34, FO
+        key_f35, // key_f35, kf35, FP
+        key_f36, // key_f36, kf36, FQ
+        key_f37, // key_f37, kf37, FR
+        key_f38, // key_f38, kf38, FS
+        key_f39, // key_f39, kf39, FT
+        key_f4, // key_f4, kf4, k4
+        key_f40, // key_f40, kf40, FU
+        key_f41, // key_f41, kf41, FV
+        key_f42, // key_f42, kf42, FW
+        key_f43, // key_f43, kf43, FX
+        key_f44, // key_f44, kf44, FY
+        key_f45, // key_f45, kf45, FZ
+        key_f46, // key_f46, kf46, Fa
+        key_f47, // key_f47, kf47, Fb
+        key_f48, // key_f48, kf48, Fc
+        key_f49, // key_f49, kf49, Fd
+        key_f5, // key_f5, kf5, k5
+        key_f50, // key_f50, kf50, Fe
+        key_f51, // key_f51, kf51, Ff
+        key_f52, // key_f52, kf52, Fg
+        key_f53, // key_f53, kf53, Fh
+        key_f54, // key_f54, kf54, Fi
+        key_f55, // key_f55, kf55, Fj
+        key_f56, // key_f56, kf56, Fk
+        key_f57, // key_f57, kf57, Fl
+        key_f58, // key_f58, kf58, Fm
+        key_f59, // key_f59, kf59, Fn
+        key_f6, // key_f6, kf6, k6
+        key_f60, // key_f60, kf60, Fo
+        key_f61, // key_f61, kf61, Fp
+        key_f62, // key_f62, kf62, Fq
+        key_f63, // key_f63, kf63, Fr
+        key_f7, // key_f7, kf7, k7
+        key_f8, // key_f8, kf8, k8
+        key_f9, // key_f9, kf9, k9
+        key_find, // key_find, kfnd, @0
+        key_help, // key_help, khlp, %1
+        key_home, // key_home, khome, kh
+        key_ic, // key_ic, kich1, kI
+        key_il, // key_il, kil1, kA
+        key_left, // key_left, kcub1, kl
+        key_ll, // key_ll, kll, kH
+        key_mark, // key_mark, kmrk, %2
+        key_message, // key_message, kmsg, %3
+        key_move, // key_move, kmov, %4
+        key_next, // key_next, knxt, %5
+        key_npage, // key_npage, knp, kN
+        key_open, // key_open, kopn, %6
+        key_options, // key_options, kopt, %7
+        key_ppage, // key_ppage, kpp, kP
+        key_previous, // key_previous, kprv, %8
+        key_print, // key_print, kprt, %9
+        key_redo, // key_redo, krdo, %0
+        key_reference, // key_reference, kref, &1
+        key_refresh, // key_refresh, krfr, &2
+        key_replace, // key_replace, krpl, &3
+        key_restart, // key_restart, krst, &4
+        key_resume, // key_resume, kres, &5
+        key_right, // key_right, kcuf1, kr
+        key_save, // key_save, ksav, &6
+        key_sbeg, // key_sbeg, kBEG, &9
+        key_scancel, // key_scancel, kCAN, &0
+        key_scommand, // key_scommand, kCMD, *1
+        key_scopy, // key_scopy, kCPY, *2
+        key_screate, // key_screate, kCRT, *3
+        key_sdc, // key_sdc, kDC, *4
+        key_sdl, // key_sdl, kDL, *5
+        key_select, // key_select, kslt, *6
+        key_send, // key_send, kEND, *7
+        key_seol, // key_seol, kEOL, *8
+        key_sexit, // key_sexit, kEXT, *9
+        key_sf, // key_sf, kind, kF
+        key_sfind, // key_sfind, kFND, *0
+        key_shelp, // key_shelp, kHLP, #1
+        key_shome, // key_shome, kHOM, #2
+        key_sic, // key_sic, kIC, #3
+        key_sleft, // key_sleft, kLFT, #4
+        key_smessage, // key_smessage, kMSG, %a
+        key_smove, // key_smove, kMOV, %b
+        key_snext, // key_snext, kNXT, %c
+        key_soptions, // key_soptions, kOPT, %d
+        key_sprevious, // key_sprevious, kPRV, %e
+        key_sprint, // key_sprint, kPRT, %f
+        key_sr, // key_sr, kri, kR
+        key_sredo, // key_sredo, kRDO, %g
+        key_sreplace, // key_sreplace, kRPL, %h
+        key_sright, // key_sright, kRIT, %i
+        key_srsume, // key_srsume, kRES, %j
+        key_ssave, // key_ssave, kSAV, !1
+        key_ssuspend, // key_ssuspend, kSPD, !2
+        key_stab, // key_stab, khts, kT
+        key_sundo, // key_sundo, kUND, !3
+        key_suspend, // key_suspend, kspd, &7
+        key_undo, // key_undo, kund, &8
+        key_up, // key_up, kcuu1, ku
+        keypad_local, // keypad_local, rmkx, ke
+        keypad_xmit, // keypad_xmit, smkx, ks
+        lab_f0, // lab_f0, lf0, l0
+        lab_f1, // lab_f1, lf1, l1
+        lab_f10, // lab_f10, lf10, la
+        lab_f2, // lab_f2, lf2, l2
+        lab_f3, // lab_f3, lf3, l3
+        lab_f4, // lab_f4, lf4, l4
+        lab_f5, // lab_f5, lf5, l5
+        lab_f6, // lab_f6, lf6, l6
+        lab_f7, // lab_f7, lf7, l7
+        lab_f8, // lab_f8, lf8, l8
+        lab_f9, // lab_f9, lf9, l9
+        label_format, // label_format, fln, Lf
+        label_off, // label_off, rmln, LF
+        label_on, // label_on, smln, LO
+        meta_off, // meta_off, rmm, mo
+        meta_on, // meta_on, smm, mm
+        micro_column_address, // micro_column_address, mhpa, ZY
+        micro_down, // micro_down, mcud1, ZZ
+        micro_left, // micro_left, mcub1, Za
+        micro_right, // micro_right, mcuf1, Zb
+        micro_row_address, // micro_row_address, mvpa, Zc
+        micro_up, // micro_up, mcuu1, Zd
+        newline, // newline, nel, nw
+        order_of_pins, // order_of_pins, porder, Ze
+        orig_colors, // orig_colors, oc, oc
+        orig_pair, // orig_pair, op, op
+        pad_char, // pad_char, pad, pc
+        parm_dch, // parm_dch, dch, DC
+        parm_delete_line, // parm_delete_line, dl, DL
+        parm_down_cursor, // parm_down_cursor, cud, DO
+        parm_down_micro, // parm_down_micro, mcud, Zf
+        parm_ich, // parm_ich, ich, IC
+        parm_index, // parm_index, indn, SF
+        parm_insert_line, // parm_insert_line, il, AL
+        parm_left_cursor, // parm_left_cursor, cub, LE
+        parm_left_micro, // parm_left_micro, mcub, Zg
+        parm_right_cursor, // parm_right_cursor, cuf, RI
+        parm_right_micro, // parm_right_micro, mcuf, Zh
+        parm_rindex, // parm_rindex, rin, SR
+        parm_up_cursor, // parm_up_cursor, cuu, UP
+        parm_up_micro, // parm_up_micro, mcuu, Zi
+        pkey_key, // pkey_key, pfkey, pk
+        pkey_local, // pkey_local, pfloc, pl
+        pkey_xmit, // pkey_xmit, pfx, px
+        plab_norm, // plab_norm, pln, pn
+        print_screen, // print_screen, mc0, ps
+        prtr_non, // prtr_non, mc5p, pO
+        prtr_off, // prtr_off, mc4, pf
+        prtr_on, // prtr_on, mc5, po
+        pulse, // pulse, pulse, PU
+        quick_dial, // quick_dial, qdial, QD
+        remove_clock, // remove_clock, rmclk, RC
+        repeat_char, // repeat_char, rep, rp
+        req_for_input, // req_for_input, rfi, RF
+        reset_1string, // reset_1string, rs1, r1
+        reset_2string, // reset_2string, rs2, r2
+        reset_3string, // reset_3string, rs3, r3
+        reset_file, // reset_file, rf, rf
+        restore_cursor, // restore_cursor, rc, rc
+        row_address, // row_address, vpa, cv
+        save_cursor, // save_cursor, sc, sc
+        scroll_forward, // scroll_forward, ind, sf
+        scroll_reverse, // scroll_reverse, ri, sr
+        select_char_set, // select_char_set, scs, Zj
+        set_attributes, // set_attributes, sgr, sa
+        set_background, // set_background, setb, Sb
+        set_bottom_margin, // set_bottom_margin, smgb, Zk
+        set_bottom_margin_parm, // set_bottom_margin_parm, smgbp, Zl
+        set_clock, // set_clock, sclk, SC
+        set_color_pair, // set_color_pair, scp, sp
+        set_foreground, // set_foreground, setf, Sf
+        set_left_margin, // set_left_margin, smgl, ML
+        set_left_margin_parm, // set_left_margin_parm, smglp, Zm
+        set_right_margin, // set_right_margin, smgr, MR
+        set_right_margin_parm, // set_right_margin_parm, smgrp, Zn
+        set_tab, // set_tab, hts, st
+        set_top_margin, // set_top_margin, smgt, Zo
+        set_top_margin_parm, // set_top_margin_parm, smgtp, Zp
+        set_window, // set_window, wind, wi
+        start_bit_image, // start_bit_image, sbim, Zq
+        start_char_set_def, // start_char_set_def, scsd, Zr
+        stop_bit_image, // stop_bit_image, rbim, Zs
+        stop_char_set_def, // stop_char_set_def, rcsd, Zt
+        subscript_characters, // subscript_characters, subcs, Zu
+        superscript_characters, // superscript_characters, supcs, Zv
+        tab, // tab, ht, ta
+        these_cause_cr, // these_cause_cr, docr, Zw
+        to_status_line, // to_status_line, tsl, ts
+        tone, // tone, tone, TO
+        underline_char, // underline_char, uc, uc
+        up_half_line, // up_half_line, hu, hu
+        user0, // user0, u0, u0
+        user1, // user1, u1, u1
+        user2, // user2, u2, u2
+        user3, // user3, u3, u3
+        user4, // user4, u4, u4
+        user5, // user5, u5, u5
+        user6, // user6, u6, u6
+        user7, // user7, u7, u7
+        user8, // user8, u8, u8
+        user9, // user9, u9, u9
+        wait_tone, // wait_tone, wait, WA
+        xoff_character, // xoff_character, xoffc, XF
+        xon_character, // xon_character, xonc, XN
+        zero_motion, // zero_motion, zerom, Zx
+        alt_scancode_esc, // alt_scancode_esc, scesa, S8
+        bit_image_carriage_return, // bit_image_carriage_return, bicr, Yv
+        bit_image_newline, // bit_image_newline, binel, Zz
+        bit_image_repeat, // bit_image_repeat, birep, Xy
+        char_set_names, // char_set_names, csnm, Zy
+        code_set_init, // code_set_init, csin, ci
+        color_names, // color_names, colornm, Yw
+        define_bit_image_region, // define_bit_image_region, defbi, Yx
+        device_type, // device_type, devt, dv
+        display_pc_char, // display_pc_char, dispc, S1
+        end_bit_image_region, // end_bit_image_region, endbi, Yy
+        enter_pc_charset_mode, // enter_pc_charset_mode, smpch, S2
+        enter_scancode_mode, // enter_scancode_mode, smsc, S4
+        exit_pc_charset_mode, // exit_pc_charset_mode, rmpch, S3
+        exit_scancode_mode, // exit_scancode_mode, rmsc, S5
+        get_mouse, // get_mouse, getm, Gm
+        key_mouse, // key_mouse, kmous, Km
+        mouse_info, // mouse_info, minfo, Mi
+        pc_term_options, // pc_term_options, pctrm, S6
+        pkey_plab, // pkey_plab, pfxl, xl
+        req_mouse_pos, // req_mouse_pos, reqmp, RQ
+        scancode_escape, // scancode_escape, scesc, S7
+        set0_des_seq, // set0_des_seq, s0ds, s0
+        set1_des_seq, // set1_des_seq, s1ds, s1
+        set2_des_seq, // set2_des_seq, s2ds, s2
+        set3_des_seq, // set3_des_seq, s3ds, s3
+        set_a_background, // set_a_background, setab, AB
+        set_a_foreground, // set_a_foreground, setaf, AF
+        set_color_band, // set_color_band, setcolor, Yz
+        set_lr_margin, // set_lr_margin, smglr, ML
+        set_page_length, // set_page_length, slines, YZ
+        set_tb_margin, // set_tb_margin, smgtb, MT
+        enter_horizontal_hl_mode, // enter_horizontal_hl_mode, ehhlm, Xh
+        enter_left_hl_mode, // enter_left_hl_mode, elhlm, Xl
+        enter_low_hl_mode, // enter_low_hl_mode, elohlm, Xo
+        enter_right_hl_mode, // enter_right_hl_mode, erhlm, Xr
+        enter_top_hl_mode, // enter_top_hl_mode, ethlm, Xt
+        enter_vertical_hl_mode, // enter_vertical_hl_mode, evhlm, Xv
+        set_a_attributes, // set_a_attributes, sgr1, sA
+        set_pglen_inch, // set_pglen_inch, slength, sL)
         ;
 
         public String[] getNames() {
@@ -515,8 +513,9 @@ public static Capability byName(String name) {
     public static Map<String, Capability> getCapabilitiesByName() {
         Map<String, Capability> capabilities = new LinkedHashMap<>();
         try (InputStream is = InfoCmp.class.getResourceAsStream("capabilities.txt");
-             BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-            br.lines().map(String::trim)
+                BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+            br.lines()
+                    .map(String::trim)
                     .filter(s -> !s.startsWith("#"))
                     .filter(s -> !s.isEmpty())
                     .forEach(s -> {
@@ -539,9 +538,7 @@ public static void setDefaultInfoCmp(String terminal, Supplier<String> caps) {
         CAPS.putIfAbsent(terminal, caps);
     }
 
-    public static String getInfoCmp(
-            String terminal
-    ) throws IOException, InterruptedException {
+    public static String getInfoCmp(String terminal) throws IOException, InterruptedException {
         String caps = getLoadedInfoCmp(terminal);
         if (caps == null) {
             Process p = new ProcessBuilder(OSUtils.INFOCMP_COMMAND, terminal).start();
@@ -563,8 +560,7 @@ public static void parseInfoCmp(
             String capabilities,
             Set<Capability> bools,
             Map<Capability, Integer> ints,
-            Map<Capability, String> strings
-    ) {
+            Map<Capability, String> strings) {
         Map<String, Capability> capsByName = getCapabilitiesByName();
         String[] lines = capabilities.split("\n");
         for (int i = 1; i < lines.length; i++) {
@@ -609,7 +605,7 @@ public static void parseInfoCmp(
 
     static String loadDefaultInfoCmp(String name) {
         try (InputStream is = InfoCmp.class.getResourceAsStream(name + ".caps");
-             BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
             return br.lines().collect(Collectors.joining("\n", "", "\n"));
         } catch (IOException e) {
             throw new IOError(e);
@@ -617,11 +613,23 @@ static String loadDefaultInfoCmp(String name) {
     }
 
     static {
-        for (String s : Arrays.asList("dumb", "dumb-color", "ansi", "xterm", "xterm-256color",
-                "windows", "windows-256color", "windows-conemu", "windows-vtp",
-                "screen", "screen-256color", "rxvt-unicode", "rxvt-unicode-256color", "rxvt-basic", "rxvt")) {
+        for (String s : Arrays.asList(
+                "dumb",
+                "dumb-color",
+                "ansi",
+                "xterm",
+                "xterm-256color",
+                "windows",
+                "windows-256color",
+                "windows-conemu",
+                "windows-vtp",
+                "screen",
+                "screen-256color",
+                "rxvt-unicode",
+                "rxvt-unicode-256color",
+                "rxvt-basic",
+                "rxvt")) {
             setDefaultInfoCmp(s, () -> loadDefaultInfoCmp(s));
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
index fda314fb9b4aa..449d6aa69c85c 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -22,7 +22,6 @@
 import java.nio.charset.MalformedInputException;
 import java.nio.charset.UnmappableCharacterException;
 
-
 /**
  *
  * NOTE for JLine: the default InputStreamReader that comes from the JRE
@@ -66,9 +65,10 @@ public class InputStreamReader extends Reader {
     public InputStreamReader(InputStream in) {
         super(in);
         this.in = in;
-        decoder = Charset.defaultCharset().newDecoder().onMalformedInput(
-                CodingErrorAction.REPLACE).onUnmappableCharacter(
-                CodingErrorAction.REPLACE);
+        decoder = Charset.defaultCharset()
+                .newDecoder()
+                .onMalformedInput(CodingErrorAction.REPLACE)
+                .onUnmappableCharacter(CodingErrorAction.REPLACE);
         bytes.limit(0);
     }
 
@@ -87,20 +87,19 @@ public InputStreamReader(InputStream in) {
      * @throws UnsupportedEncodingException
      *             if the encoding specified by {@code enc} cannot be found.
      */
-    public InputStreamReader(InputStream in, final String enc)
-            throws UnsupportedEncodingException {
+    public InputStreamReader(InputStream in, final String enc) throws UnsupportedEncodingException {
         super(in);
         if (enc == null) {
             throw new NullPointerException();
         }
         this.in = in;
         try {
-            decoder = Charset.forName(enc).newDecoder().onMalformedInput(
-                    CodingErrorAction.REPLACE).onUnmappableCharacter(
-                    CodingErrorAction.REPLACE);
+            decoder = Charset.forName(enc)
+                    .newDecoder()
+                    .onMalformedInput(CodingErrorAction.REPLACE)
+                    .onUnmappableCharacter(CodingErrorAction.REPLACE);
         } catch (IllegalArgumentException e) {
-            throw (UnsupportedEncodingException)
-                    new UnsupportedEncodingException(enc).initCause(e);
+            throw (UnsupportedEncodingException) new UnsupportedEncodingException(enc).initCause(e);
         }
         bytes.limit(0);
     }
@@ -134,9 +133,9 @@ public InputStreamReader(InputStream in, CharsetDecoder dec) {
     public InputStreamReader(InputStream in, Charset charset) {
         super(in);
         this.in = in;
-        decoder = charset.newDecoder().onMalformedInput(
-                CodingErrorAction.REPLACE).onUnmappableCharacter(
-                CodingErrorAction.REPLACE);
+        decoder = charset.newDecoder()
+                .onMalformedInput(CodingErrorAction.REPLACE)
+                .onUnmappableCharacter(CodingErrorAction.REPLACE);
         bytes.limit(0);
     }
 
@@ -257,8 +256,7 @@ public int read(char[] buf, int offset, int length) throws IOException {
                 // fill the buffer if needed
                 if (needInput) {
                     try {
-                        if ((in.available() == 0)
-                            && (out.position() > offset)) {
+                        if ((in.available() == 0) && (out.position() > offset)) {
                             // we could return the result without blocking read
                             break;
                         }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Levenshtein.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Levenshtein.java
index cc95593ed8071..015515f7d074e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Levenshtein.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Levenshtein.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -49,9 +49,8 @@ public static int distance(CharSequence lhs, CharSequence rhs) {
         return distance(lhs, rhs, 1, 1, 1, 1);
     }
 
-    public static int distance(CharSequence source, CharSequence target,
-                               int deleteCost, int insertCost,
-                               int replaceCost, int swapCost) {
+    public static int distance(
+            CharSequence source, CharSequence target, int deleteCost, int insertCost, int replaceCost, int swapCost) {
         /*
          * Required to facilitate the premise to the algorithm that two swaps of the
          * same character are never required for optimality.
@@ -115,5 +114,4 @@ public static int distance(CharSequence source, CharSequence target,
         }
         return table[source.length() - 1][target.length() - 1];
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Log.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Log.java
index 91f18755e255f..254173d5bd971 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Log.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -73,8 +73,7 @@ static void render(final PrintStream out, final Object message) {
                 }
             }
             out.print("]");
-        }
-        else {
+        } else {
             out.print(message);
         }
     }
@@ -84,11 +83,10 @@ static void render(final PrintStream out, final Object message) {
 //        ByteArrayOutputStream baos = new ByteArrayOutputStream();
 //        PrintStream ps = new PrintStream(baos);
 //        for (int i = 0; i < messages.length; i++) {
-//            // Special handling for the last message if its a throwable, render its stack on the next line
+//            // Special handling for the last message if it's a throwable, render its stack on the next line
 //            if (i + 1 == messages.length && messages[i] instanceof Throwable) {
 //                cause = (Throwable) messages[i];
-//            }
-//            else {
+//            } else {
 //                render(ps, messages[i]);
 //            }
 //        }
@@ -122,5 +120,4 @@ static void render(final PrintStream out, final Object message) {
 //    static boolean isEnabled(Level level) {
 //        return logger.isLoggable(level);
 //    }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java
index f8cb53489f991..4130634ca4bfb 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -84,8 +84,7 @@ private NonBlockingReaderInputStream(NonBlockingReader reader, Charset charset)
 
         @Override
         public int available() {
-            return (int) (reader.available() * this.encoder.averageBytesPerChar())
-                    + bytes.remaining();
+            return (int) (reader.available() * this.encoder.averageBytesPerChar()) + bytes.remaining();
         }
 
         @Override
@@ -124,7 +123,6 @@ public int read(long timeout, boolean isPeek) throws IOException {
                 return READ_EXPIRED;
             }
         }
-
     }
 
     private static class NonBlockingInputStreamReader extends NonBlockingReader {
@@ -135,10 +133,12 @@ private static class NonBlockingInputStreamReader extends NonBlockingReader {
         private final CharBuffer chars;
 
         public NonBlockingInputStreamReader(NonBlockingInputStream inputStream, Charset encoding) {
-            this(inputStream,
-                (encoding != null ? encoding : Charset.defaultCharset()).newDecoder()
-                    .onMalformedInput(CodingErrorAction.REPLACE)
-                    .onUnmappableCharacter(CodingErrorAction.REPLACE));
+            this(
+                    inputStream,
+                    (encoding != null ? encoding : Charset.defaultCharset())
+                            .newDecoder()
+                            .onMalformedInput(CodingErrorAction.REPLACE)
+                            .onUnmappableCharacter(CodingErrorAction.REPLACE));
         }
 
         public NonBlockingInputStreamReader(NonBlockingInputStream input, CharsetDecoder decoder) {
@@ -201,8 +201,8 @@ public int readBuffered(char[] b, int off, int len, long timeout) throws IOExcep
                         bytes.position(0);
                         bytes.limit(0);
                     }
-                    int nb = input.readBuffered(bytes.array(), bytes.limit(),
-                                            bytes.capacity() - bytes.limit(), t.timeout());
+                    int nb = input.readBuffered(
+                            bytes.array(), bytes.limit(), bytes.capacity() - bytes.limit(), t.timeout());
                     if (nb < 0) {
                         return nb;
                     }
@@ -227,5 +227,4 @@ public void close() throws IOException {
             input.close();
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStream.java
index a4283eb700625..10ab68cfd28e0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStream.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -74,7 +74,7 @@ public int read(byte b[], int off, int len) throws IOException {
         if (c == EOF) {
             return EOF;
         }
-        b[off] = (byte)c;
+        b[off] = (byte) c;
         return 1;
     }
 
@@ -115,9 +115,7 @@ public int readBuffered(byte[] b, int off, int len, long timeout) throws IOExcep
      * thread is currently blocked waiting for I/O it may not actually
      * shut down until the I/O is received.
      */
-    public void shutdown() {
-    }
+    public void shutdown() {}
 
     public abstract int read(long timeout, boolean isPeek) throws IOException;
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStreamImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStreamImpl.java
index 680047fbe60e0..24cf13a0ee5ad 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStreamImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStreamImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -26,17 +26,15 @@
  *          the thread that handles blocking I/O.
  * </ul>
  */
-public class NonBlockingInputStreamImpl
-    extends NonBlockingInputStream
-{
-    private InputStream in;                  // The actual input stream
-    private int         b = READ_EXPIRED;    // Recently read byte
-
-    private String      name;
-    private boolean     threadIsReading      = false;
-    private IOException exception            = null;
-    private long        threadDelay          = 60 * 1000;
-    private Thread      thread;
+public class NonBlockingInputStreamImpl extends NonBlockingInputStream {
+    private InputStream in; // The actual input stream
+    private int b = READ_EXPIRED; // Recently read byte
+
+    private String name;
+    private boolean threadIsReading = false;
+    private IOException exception = null;
+    private long threadDelay = 60 * 1000;
+    private Thread thread;
 
     /**
      * Creates a <code>NonBlockingReader</code> out of a normal blocking
@@ -97,8 +95,7 @@ public synchronized int read(long timeout, boolean isPeek) throws IOException {
         if (exception != null) {
             assert b == READ_EXPIRED;
             IOException toBeThrown = exception;
-            if (!isPeek)
-                exception = null;
+            if (!isPeek) exception = null;
             throw toBeThrown;
         }
 
@@ -109,11 +106,9 @@ public synchronized int read(long timeout, boolean isPeek) throws IOException {
          */
         if (b >= -1) {
             assert exception == null;
-        }
-        else if (!isPeek && timeout <= 0L && !threadIsReading) {
+        } else if (!isPeek && timeout <= 0L && !threadIsReading) {
             b = in.read();
-        }
-        else {
+        } else {
             /*
              * If the thread isn't reading already, then ask it to do so.
              */
@@ -128,14 +123,13 @@ else if (!isPeek && timeout <= 0L && !threadIsReading) {
              * now we play the waiting game.
              */
             Timeout t = new Timeout(timeout);
-            while (!t.elapsed())  {
+            while (!t.elapsed()) {
                 try {
                     if (Thread.interrupted()) {
                         throw new InterruptedException();
                     }
                     wait(t.timeout());
-                }
-                catch (InterruptedException e) {
+                } catch (InterruptedException e) {
                     exception = (IOException) new InterruptedIOException().initCause(e);
                 }
 
@@ -143,8 +137,7 @@ else if (!isPeek && timeout <= 0L && !threadIsReading) {
                     assert b == READ_EXPIRED;
 
                     IOException toBeThrown = exception;
-                    if (!isPeek)
-                        exception = null;
+                    if (!isPeek) exception = null;
                     throw toBeThrown;
                 }
 
@@ -168,7 +161,7 @@ else if (!isPeek && timeout <= 0L && !threadIsReading) {
         return ret;
     }
 
-    private void run () {
+    private void run() {
         Log.debug("NonBlockingInputStream start");
         boolean needToRead;
 
@@ -236,5 +229,4 @@ private void run () {
             }
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpInputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpInputStream.java
index 5a3613443508e..aad6e3d0f5af0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpInputStream.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -57,11 +57,7 @@ private int wait(ByteBuffer buffer, long timeout) throws IOException {
                 throw new InterruptedIOException();
             }
         }
-        return buffer.hasRemaining()
-                ? 0
-                : closed
-                    ? EOF
-                    : READ_EXPIRED;
+        return buffer.hasRemaining() ? 0 : closed ? EOF : READ_EXPIRED;
     }
 
     private static boolean rewind(ByteBuffer buffer, ByteBuffer other) {
@@ -167,7 +163,7 @@ private class NbpOutputStream extends OutputStream {
 
         @Override
         public void write(int b) throws IOException {
-            NonBlockingPumpInputStream.this.write(new byte[] { (byte) b }, 0, 1);
+            NonBlockingPumpInputStream.this.write(new byte[] {(byte) b}, 0, 1);
         }
 
         @Override
@@ -184,7 +180,5 @@ public void flush() throws IOException {
         public void close() throws IOException {
             NonBlockingPumpInputStream.this.close();
         }
-
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpReader.java
index f36423f03b82f..63db6e5f5bf7f 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -121,7 +121,7 @@ public int readBuffered(char[] b, int off, int len, long timeout) throws IOExcep
                     try {
                         if (timeout > 0) {
                             if (!notEmpty.await(timeout, TimeUnit.MILLISECONDS)) {
-                                throw new IOException( "Timeout reading" );
+                                throw new IOException("Timeout reading");
                             }
                         } else {
                             notEmpty.await();
@@ -207,14 +207,11 @@ public void write(char[] cbuf, int off, int len) throws IOException {
         }
 
         @Override
-        public void flush() throws IOException {
-        }
+        public void flush() throws IOException {}
 
         @Override
         public void close() throws IOException {
             NonBlockingPumpReader.this.close();
         }
-
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReader.java
index e2f664f29993b..460f548b5069f 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -23,8 +23,7 @@ public abstract class NonBlockingReader extends Reader {
      * thread is currently blocked waiting for I/O it will not actually
      * shut down until the I/O is received.
      */
-    public void shutdown() {
-    }
+    public void shutdown() {}
 
     @Override
     public int read() throws IOException {
@@ -109,5 +108,4 @@ public int available() {
      * @throws IOException if anything wrong happens
      */
     protected abstract int read(long timeout, boolean isPeek) throws IOException;
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReaderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReaderImpl.java
index d384cc9a0dc01..5aaabd1d3c0d0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReaderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReaderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -28,19 +28,17 @@
  * @since 2.7
  * @author Scott C. Gray &lt;scottgray1@gmail.com&gt;
  */
-public class NonBlockingReaderImpl
-    extends NonBlockingReader
-{
+public class NonBlockingReaderImpl extends NonBlockingReader {
     public static final int READ_EXPIRED = -2;
 
-    private Reader in;                  // The actual input stream
-    private int    ch   = READ_EXPIRED; // Recently read character
+    private Reader in; // The actual input stream
+    private int ch = READ_EXPIRED; // Recently read character
 
-    private String      name;
-    private boolean     threadIsReading      = false;
-    private IOException exception            = null;
-    private long        threadDelay          = 60 * 1000;
-    private Thread      thread;
+    private String name;
+    private boolean threadIsReading = false;
+    private IOException exception = null;
+    private long threadDelay = 60 * 1000;
+    private Thread thread;
 
     /**
      * Creates a <code>NonBlockingReader</code> out of a normal blocking
@@ -135,8 +133,7 @@ protected synchronized int read(long timeout, boolean isPeek) throws IOException
         if (exception != null) {
             assert ch == READ_EXPIRED;
             IOException toBeThrown = exception;
-            if (!isPeek)
-                exception = null;
+            if (!isPeek) exception = null;
             throw toBeThrown;
         }
 
@@ -147,11 +144,9 @@ protected synchronized int read(long timeout, boolean isPeek) throws IOException
          */
         if (ch >= -1) {
             assert exception == null;
-        }
-        else if (!isPeek && timeout <= 0L && !threadIsReading) {
+        } else if (!isPeek && timeout <= 0L && !threadIsReading) {
             ch = in.read();
-        }
-        else {
+        } else {
             /*
              * If the thread isn't reading already, then ask it to do so.
              */
@@ -166,14 +161,13 @@ else if (!isPeek && timeout <= 0L && !threadIsReading) {
              * now we play the waiting game.
              */
             Timeout t = new Timeout(timeout);
-            while (!t.elapsed())  {
+            while (!t.elapsed()) {
                 try {
                     if (Thread.interrupted()) {
                         throw new InterruptedException();
                     }
                     wait(t.timeout());
-                }
-                catch (InterruptedException e) {
+                } catch (InterruptedException e) {
                     exception = (IOException) new InterruptedIOException().initCause(e);
                 }
 
@@ -181,8 +175,7 @@ else if (!isPeek && timeout <= 0L && !threadIsReading) {
                     assert ch == READ_EXPIRED;
 
                     IOException toBeThrown = exception;
-                    if (!isPeek)
-                        exception = null;
+                    if (!isPeek) exception = null;
                     throw toBeThrown;
                 }
 
@@ -206,7 +199,7 @@ else if (!isPeek && timeout <= 0L && !threadIsReading) {
         return ret;
     }
 
-    private void run () {
+    private void run() {
         Log.debug("NonBlockingReader start");
         boolean needToRead;
 
@@ -245,12 +238,12 @@ private void run () {
                 IOException failure = null;
                 try {
                     charRead = in.read();
-//                    if (charRead < 0) {
-//                        continue;
-//                    }
+                    //                    if (charRead < 0) {
+                    //                        continue;
+                    //                    }
                 } catch (IOException e) {
                     failure = e;
-//                    charRead = -1;
+                    //                    charRead = -1;
                 }
 
                 /*
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java
index 97487731852ef..344d081c12486 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -9,16 +9,23 @@
 package jdk.internal.org.jline.utils;
 
 import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 public class OSUtils {
 
-    public static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase().contains("win");
+    public static final boolean IS_LINUX =
+            System.getProperty("os.name").toLowerCase().contains("linux");
 
-    public static final boolean IS_CYGWIN = IS_WINDOWS
-            && System.getenv("PWD") != null
-            && System.getenv("PWD").startsWith("/");
+    public static final boolean IS_WINDOWS =
+            System.getProperty("os.name").toLowerCase().contains("win");
+
+    public static final boolean IS_OSX =
+            System.getProperty("os.name").toLowerCase().contains("mac");
+
+    public static final boolean IS_AIX =
+            System.getProperty("os.name").toLowerCase().contains("aix");
+
+    public static final boolean IS_CYGWIN =
+            IS_WINDOWS && System.getenv("PWD") != null && System.getenv("PWD").startsWith("/");
 
     @Deprecated
     public static final boolean IS_MINGW = IS_WINDOWS
@@ -28,7 +35,7 @@ public class OSUtils {
     public static final boolean IS_MSYSTEM = IS_WINDOWS
             && System.getenv("MSYSTEM") != null
             && (System.getenv("MSYSTEM").startsWith("MINGW")
-                || System.getenv("MSYSTEM").equals("MSYS"));
+                    || System.getenv("MSYSTEM").equals("MSYS"));
 
     public static final boolean IS_WSL = System.getenv("WSL_DISTRO_NAME") != null;
 
@@ -36,11 +43,7 @@ public class OSUtils {
 
     public static final boolean IS_WSL2 = IS_WSL && !IS_WSL1;
 
-    public static final boolean IS_CONEMU = IS_WINDOWS
-            && System.getenv("ConEmuPID") != null;
-
-    public static final boolean IS_OSX = System.getProperty("os.name").toLowerCase().contains("mac");
-    public static final boolean IS_AIX = System.getProperty("os.name").equals("AIX");
+    public static final boolean IS_CONEMU = IS_WINDOWS && System.getenv("ConEmuPID") != null;
 
     public static String TTY_COMMAND;
     public static String STTY_COMMAND;
@@ -48,64 +51,57 @@ public class OSUtils {
     public static String INFOCMP_COMMAND;
     public static String TEST_COMMAND;
 
+    private static boolean isExecutable(File f) {
+        return f.canExecute() && !f.isDirectory();
+    }
+
     static {
-        String tty;
-        String stty;
-        String sttyfopt;
-        String infocmp;
-        String test;
-        if (OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM) {
-            tty = null;
-            stty = null;
-            sttyfopt = null;
-            infocmp = null;
-            test = null;
-            String path = System.getenv("PATH");
-            if (path != null) {
-                String[] paths = path.split(";");
-                for (String p : paths) {
-                    if (tty == null && new File(p, "tty.exe").exists()) {
-                        tty = new File(p, "tty.exe").getAbsolutePath();
-                    }
-                    if (stty == null && new File(p, "stty.exe").exists()) {
-                        stty = new File(p, "stty.exe").getAbsolutePath();
-                    }
-                    if (infocmp == null && new File(p, "infocmp.exe").exists()) {
-                        infocmp = new File(p, "infocmp.exe").getAbsolutePath();
-                    }
-                    if (test == null && new File(p, "test.exe").exists()) {
-                        test = new File(p, "test.exe").getAbsolutePath();
-                    }
+        boolean cygwinOrMsys = OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM;
+        String suffix = cygwinOrMsys ? ".exe" : "";
+        String tty = null;
+        String stty = null;
+        String sttyfopt = null;
+        String infocmp = null;
+        String test = null;
+        String path = System.getenv("PATH");
+        if (path != null) {
+            String[] paths = path.split(File.pathSeparator);
+            for (String p : paths) {
+                File ttyFile = new File(p, "tty" + suffix);
+                if (tty == null && isExecutable(ttyFile)) {
+                    tty = ttyFile.getAbsolutePath();
+                }
+                File sttyFile = new File(p, "stty" + suffix);
+                if (stty == null && isExecutable(sttyFile)) {
+                    stty = sttyFile.getAbsolutePath();
+                }
+                File infocmpFile = new File(p, "infocmp" + suffix);
+                if (infocmp == null && isExecutable(infocmpFile)) {
+                    infocmp = infocmpFile.getAbsolutePath();
+                }
+                File testFile = new File(p, "test" + suffix);
+                if (test == null && isExecutable(testFile)) {
+                    test = testFile.getAbsolutePath();
                 }
             }
-            if (tty == null) {
-                tty = "tty.exe";
-            }
-            if (stty == null) {
-                stty = "stty.exe";
-            }
-            if (infocmp == null) {
-                infocmp = "infocmp.exe";
-            }
-            if (test == null) {
-                test = "test.exe";
-            }
-        } else {
-            tty = "tty";
-            stty = IS_OSX ? "/bin/stty" : "stty";
-            sttyfopt = IS_OSX ? "-f" : "-F";
-            infocmp = "infocmp";
-            test = isTestCommandValid("/usr/bin/test") ? "/usr/bin/test"
-                                                       : "/bin/test";
         }
+        if (tty == null) {
+            tty = "tty" + suffix;
+        }
+        if (stty == null) {
+            stty = "stty" + suffix;
+        }
+        if (infocmp == null) {
+            infocmp = "infocmp" + suffix;
+        }
+        if (test == null) {
+            test = "test" + suffix;
+        }
+        sttyfopt = IS_OSX ? "-f" : "-F";
         TTY_COMMAND = tty;
         STTY_COMMAND = stty;
         STTY_F_OPTION = sttyfopt;
         INFOCMP_COMMAND = infocmp;
         TEST_COMMAND = test;
     }
-
-    private static boolean isTestCommandValid(String command) {
-        return Files.isExecutable(Paths.get(command));
-    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/PumpReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/PumpReader.java
index e80a18b6f3c23..12e9795c6f51f 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/PumpReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/PumpReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -378,7 +378,6 @@ public void flush() throws IOException {
         public void close() throws IOException {
             reader.close();
         }
-
     }
 
     private static class InputStream extends java.io.InputStream {
@@ -464,7 +463,5 @@ public int read(byte[] b, int off, int len) throws IOException {
         public void close() throws IOException {
             reader.close();
         }
-
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ShutdownHooks.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ShutdownHooks.java
index 8089de321cce6..d5456df03d36d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ShutdownHooks.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ShutdownHooks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,8 +18,7 @@
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.7
  */
-public final class ShutdownHooks
-{
+public final class ShutdownHooks {
     private static final List<Task> tasks = new ArrayList<>();
 
     private static Thread hook;
@@ -29,8 +28,7 @@ public static synchronized <T extends Task> T add(final T task) {
 
         // Install the hook thread if needed
         if (hook == null) {
-            hook = addHook(new Thread("JLine Shutdown Hook")
-            {
+            hook = addHook(new Thread("JLine Shutdown Hook") {
                 @Override
                 public void run() {
                     runTasks();
@@ -53,8 +51,7 @@ private static synchronized void runTasks() {
             Log.debug("Running task: ", task);
             try {
                 task.run();
-            }
-            catch (Throwable e) {
+            } catch (Throwable e) {
                 Log.warn("Task failed", e);
             }
         }
@@ -91,8 +88,7 @@ private static void removeHook(final Thread thread) {
 
         try {
             Runtime.getRuntime().removeShutdownHook(thread);
-        }
-        catch (IllegalStateException e) {
+        } catch (IllegalStateException e) {
             // The VM is shutting down, not a big deal; ignore
         }
     }
@@ -100,8 +96,7 @@ private static void removeHook(final Thread thread) {
     /**
      * Essentially a {@link Runnable} which allows running to throw an exception.
      */
-    public interface Task
-    {
+    public interface Task {
         void run() throws Exception;
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Signals.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Signals.java
index b94f1fa318e66..9b25a80473573 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Signals.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Signals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,8 +21,7 @@
  */
 public final class Signals {
 
-    private Signals() {
-    }
+    private Signals() {}
 
     /**
      *
@@ -41,8 +40,8 @@ public static Object register(String name, final Runnable handler, ClassLoader l
         try {
             Class<?> signalHandlerClass = Class.forName("sun.misc.SignalHandler");
             // Implement signal handler
-            Object signalHandler = Proxy.newProxyInstance(loader,
-                    new Class<?>[]{signalHandlerClass}, (proxy, method, args) -> {
+            Object signalHandler =
+                    Proxy.newProxyInstance(loader, new Class<?>[] {signalHandlerClass}, (proxy, method, args) -> {
                         // only method we are proxying is handle()
                         if (method.getDeclaringClass() == Object.class) {
                             if ("toString".equals(method.getName())) {
@@ -101,8 +100,7 @@ private static Object doRegister(String name, Object handler) throws Exception {
             return null;
         }
         Class<?> signalHandlerClass = Class.forName("sun.misc.SignalHandler");
-        return signalClass.getMethod("handle", signalClass, signalHandlerClass)
-                .invoke(null, signal, handler);
+        return signalClass.getMethod("handle", signalClass, signalHandlerClass).invoke(null, signal, handler);
     }
 
     @SuppressWarnings("")
@@ -120,5 +118,4 @@ private static String toString(Object handler) {
         }
         return handler != null ? handler.toString() : "null";
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
index e8d9e49e8b3a1..7348b1ea1c5f3 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,187 +8,266 @@
  */
 package jdk.internal.org.jline.utils;
 
-import java.util.Objects;
-import java.util.Collections;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
 import jdk.internal.org.jline.terminal.impl.AbstractTerminal;
 import jdk.internal.org.jline.utils.InfoCmp.Capability;
-import jdk.internal.org.jline.terminal.Size;
 
 public class Status {
 
-    protected final AbstractTerminal terminal;
+    protected final Terminal terminal;
     protected final boolean supported;
-    protected List<AttributedString> oldLines = Collections.emptyList();
-    protected List<AttributedString> linesToRestore = Collections.emptyList();
-    protected int rows;
-    protected int columns;
-    protected boolean force;
     protected boolean suspended = false;
     protected AttributedString borderString;
     protected int border = 0;
+    protected Display display;
+    protected List<AttributedString> lines = Collections.emptyList();
+    protected int scrollRegion;
 
     public static Status getStatus(Terminal terminal) {
         return getStatus(terminal, true);
     }
 
-    public static Status getStatus(Terminal terminal, boolean create) {
-        return terminal instanceof AbstractTerminal
-                ? ((AbstractTerminal) terminal).getStatus(create)
-                : null;
+    public static Optional<Status> getExistingStatus(Terminal terminal) {
+        return Optional.ofNullable(getStatus(terminal, false));
     }
 
+    public static Status getStatus(Terminal terminal, boolean create) {
+        return terminal instanceof AbstractTerminal ? ((AbstractTerminal) terminal).getStatus(create) : null;
+    }
 
-    public Status(AbstractTerminal terminal) {
+    @SuppressWarnings("this-escape")
+    public Status(Terminal terminal) {
         this.terminal = Objects.requireNonNull(terminal, "terminal can not be null");
         this.supported = terminal.getStringCapability(Capability.change_scroll_region) != null
-            && terminal.getStringCapability(Capability.save_cursor) != null
-            && terminal.getStringCapability(Capability.restore_cursor) != null
-            && terminal.getStringCapability(Capability.cursor_address) != null;
+                && terminal.getStringCapability(Capability.save_cursor) != null
+                && terminal.getStringCapability(Capability.restore_cursor) != null
+                && terminal.getStringCapability(Capability.cursor_address) != null;
         if (supported) {
-            char borderChar = '\u2700';
-            AttributedStringBuilder bb = new AttributedStringBuilder();
-            for (int i = 0; i < 200; i++) {
-                bb.append(borderChar);
-            }
-            borderString = bb.toAttributedString();
+            display = new MovingCursorDisplay(terminal);
             resize();
+            display.reset();
+            scrollRegion = display.rows - 1;
         }
     }
 
+    public void close() {
+        terminal.puts(Capability.save_cursor);
+        terminal.puts(Capability.change_scroll_region, 0, display.rows - 1);
+        terminal.puts(Capability.restore_cursor);
+        terminal.flush();
+    }
+
     public void setBorder(boolean border) {
         this.border = border ? 1 : 0;
     }
 
     public void resize() {
-        Size size = terminal.getSize();
-        this.rows = size.getRows();
-        this.columns = size.getColumns();
-        this.force = true;
+        resize(terminal.getSize());
     }
 
-    public void reset() {
-        this.force = true;
+    public void resize(Size size) {
+        display.resize(size.getRows(), size.getColumns());
     }
 
-    public void hardReset() {
-        if (suspended) {
-            return;
+    public void reset() {
+        if (supported) {
+            display.reset();
+            scrollRegion = display.rows;
+            terminal.puts(Capability.change_scroll_region, 0, scrollRegion);
         }
-        List<AttributedString> lines = new ArrayList<>(oldLines);
-        int b = border;
-        update(null);
-        border = b;
-        update(lines);
     }
 
     public void redraw() {
         if (suspended) {
             return;
         }
-        update(oldLines);
+        update(lines);
     }
 
-    public void clear() {
-        privateClear(oldLines.size());
+    public void hide() {
+        update(Collections.emptyList());
     }
 
-    private void clearAll() {
-        int b = border;
-        border = 0;
-        privateClear(oldLines.size() + b);
+    public void update(List<AttributedString> lines) {
+        update(lines, true);
     }
 
-    private void privateClear(int statusSize) {
-        List<AttributedString> as = new ArrayList<>();
-        for (int i = 0; i < statusSize; i++) {
-            as.add(new AttributedString(""));
-        }
-        if (!as.isEmpty()) {
-            update(as);
-        }
-    }
+    private final AttributedString ellipsis =
+            new AttributedStringBuilder().append("\u2026", AttributedStyle.INVERSE).toAttributedString();
 
-    public void update(List<AttributedString> lines) {
+    /**
+     * Returns <code>true</code> if the cursor may be misplaced and should
+     * be updated.
+     */
+    public void update(List<AttributedString> lines, boolean flush) {
         if (!supported) {
             return;
         }
-        if (lines == null) {
-            lines = Collections.emptyList();
-        }
+        this.lines = new ArrayList<>(lines);
         if (suspended) {
-            linesToRestore = new ArrayList<>(lines);
             return;
         }
-        if (lines.isEmpty()) {
-            clearAll();
+
+        lines = new ArrayList<>(lines);
+        // add border
+        int rows = display.rows;
+        int columns = display.columns;
+        if (border == 1 && !lines.isEmpty() && rows > 1) {
+            lines.add(0, getBorderString(columns));
         }
-        if (oldLines.equals(lines) && !force) {
-            return;
+        // trim or complete lines to the full width
+        for (int i = 0; i < lines.size(); i++) {
+            AttributedString str = lines.get(i);
+            if (str.columnLength() > columns) {
+                str = new AttributedStringBuilder(columns)
+                        .append(lines.get(i).columnSubSequence(0, columns - ellipsis.columnLength()))
+                        .append(ellipsis)
+                        .toAttributedString();
+            } else if (str.columnLength() < columns) {
+                str = new AttributedStringBuilder(columns)
+                        .append(str)
+                        .append(' ', columns - str.columnLength())
+                        .toAttributedString();
+            }
+            lines.set(i, str);
         }
-        int statusSize = lines.size() + (lines.size() == 0 ? 0 : border);
-        int nb = statusSize - oldLines.size() - (oldLines.size() == 0 ? 0 : border);
-        if (nb > 0) {
-            for (int i = 0; i < nb; i++) {
+
+        List<AttributedString> oldLines = this.display.oldLines;
+
+        int newScrollRegion = display.rows - 1 - lines.size();
+        // Update the scroll region if needed.
+        // Note that settings the scroll region usually moves the cursor, so we need to get ready for that.
+        if (newScrollRegion < scrollRegion) {
+            // We need to scroll up to grow the status bar
+            terminal.puts(Capability.save_cursor);
+            for (int i = newScrollRegion; i < scrollRegion; i++) {
                 terminal.puts(Capability.cursor_down);
             }
-            for (int i = 0; i < nb; i++) {
+            terminal.puts(Capability.change_scroll_region, 0, newScrollRegion);
+            terminal.puts(Capability.restore_cursor);
+            for (int i = newScrollRegion; i < scrollRegion; i++) {
                 terminal.puts(Capability.cursor_up);
             }
+            scrollRegion = newScrollRegion;
+        } else if (newScrollRegion > scrollRegion) {
+            terminal.puts(Capability.save_cursor);
+            terminal.puts(Capability.change_scroll_region, 0, newScrollRegion);
+            terminal.puts(Capability.restore_cursor);
+            scrollRegion = newScrollRegion;
         }
-        terminal.puts(Capability.save_cursor);
-        terminal.puts(Capability.cursor_address, rows - statusSize, 0);
-        if (!terminal.puts(Capability.clr_eos)) {
-            for (int i = rows - statusSize; i < rows; i++) {
-                terminal.puts(Capability.cursor_address, i, 0);
+
+        // if the display has more lines, we need to add empty ones to make sure they will be erased
+        List<AttributedString> toDraw = new ArrayList<>(lines);
+        int nbToDraw = toDraw.size();
+        int nbOldLines = oldLines.size();
+        if (nbOldLines > nbToDraw) {
+            terminal.puts(Capability.save_cursor);
+            terminal.puts(Capability.cursor_address, display.rows - nbOldLines, 0);
+            for (int i = 0; i < nbOldLines - nbToDraw; i++) {
                 terminal.puts(Capability.clr_eol);
+                if (i < nbOldLines - nbToDraw - 1) {
+                    terminal.puts(Capability.cursor_down);
+                }
+                oldLines.remove(0);
             }
+            terminal.puts(Capability.restore_cursor);
         }
-        if (border == 1 && lines.size() > 0) {
-            terminal.puts(Capability.cursor_address, rows - statusSize, 0);
-            borderString.columnSubSequence(0, columns).print(terminal);
-        }
-        for (int i = 0; i < lines.size(); i++) {
-            terminal.puts(Capability.cursor_address, rows - lines.size() + i, 0);
-            if (lines.get(i).length() > columns) {
-                AttributedStringBuilder asb = new AttributedStringBuilder();
-                asb.append(lines.get(i).substring(0, columns - 3)).append("...", new AttributedStyle(AttributedStyle.INVERSE));
-                asb.toAttributedString().columnSubSequence(0, columns).print(terminal);
-            } else {
-                lines.get(i).columnSubSequence(0, columns).print(terminal);
+        // update display
+        display.update(lines, -1, flush);
+    }
+
+    private AttributedString getBorderString(int columns) {
+        if (borderString == null || borderString.length() != columns) {
+            char borderChar = '\u2700';
+            AttributedStringBuilder bb = new AttributedStringBuilder();
+            for (int i = 0; i < columns; i++) {
+                bb.append(borderChar);
             }
+            borderString = bb.toAttributedString();
         }
-        terminal.puts(Capability.change_scroll_region, 0, rows - 1 - statusSize);
-        terminal.puts(Capability.restore_cursor);
-        terminal.flush();
-        oldLines = new ArrayList<>(lines);
-        force = false;
+        return borderString;
     }
 
+    /**
+     * The {@code suspend} method is used when a full-screen.
+     * If the status was not already suspended, the lines
+     * used by the status are cleared during this call.
+     */
     public void suspend() {
-        if (suspended) {
-            return;
+        if (!suspended) {
+            suspended = true;
         }
-        linesToRestore = new ArrayList<>(oldLines);
-        int b = border;
-        update(null);
-        border = b;
-        suspended = true;
     }
 
+    /**
+     * The {@code restore()} call is the opposite of {@code suspend()} and
+     * will make the status bar be updated again.
+     * If the status was suspended, the lines
+     * used by the status will be drawn during this call.
+     */
     public void restore() {
-        if (!suspended) {
-            return;
+        if (suspended) {
+            suspended = false;
+            update(this.lines);
         }
-        suspended = false;
-        update(linesToRestore);
-        linesToRestore = Collections.emptyList();
     }
 
     public int size() {
-        return oldLines.size() + border;
+        return size(this.lines);
+    }
+
+    private int size(List<?> lines) {
+        int l = lines.size();
+        return l > 0 ? l + border : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "Status[" + "supported=" + supported + ']';
     }
 
+    static class MovingCursorDisplay extends Display {
+        protected int firstLine;
+
+        public MovingCursorDisplay(Terminal terminal) {
+            super(terminal, false);
+        }
+
+        @Override
+        public void update(List<AttributedString> newLines, int targetCursorPos, boolean flush) {
+            cursorPos = -1;
+            firstLine = rows - newLines.size();
+            super.update(newLines, targetCursorPos, flush);
+            if (cursorPos != -1) {
+                terminal.puts(Capability.restore_cursor);
+            }
+        }
+
+        @Override
+        protected void moveVisualCursorTo(int targetPos, List<AttributedString> newLines) {
+            initCursor();
+            super.moveVisualCursorTo(targetPos, newLines);
+        }
+
+        @Override
+        protected int moveVisualCursorTo(int i1) {
+            initCursor();
+            return super.moveVisualCursorTo(i1);
+        }
+
+        void initCursor() {
+            if (cursorPos == -1) {
+                terminal.puts(Capability.save_cursor);
+                terminal.puts(Capability.cursor_address, firstLine, 0);
+                cursorPos = 0;
+            }
+        }
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/StyleResolver.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/StyleResolver.java
index be1659957b445..29d87cbc3c85f 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/StyleResolver.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/StyleResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -55,12 +55,12 @@ private static Integer colorRgb(String name) {
                 return null;
             }
         } else {
-           // load indexed color
-           Integer color = color(name);
-           if (color != null && color != -1) {
-               color = Colors.DEFAULT_COLORS_256[color];
-           }
-           return color;
+            // load indexed color
+            Integer color = color(name);
+            if (color != null && color != -1) {
+                color = Colors.DEFAULT_COLORS_256[color];
+            }
+            return color;
         }
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Timeout.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Timeout.java
index edea89cf2d9c3..1e3091e19a117 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Timeout.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -44,5 +44,4 @@ public boolean elapsed() {
     public long timeout() {
         return timeout > 0 ? Math.max(1, end - cur) : timeout;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WCWidth.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WCWidth.java
index db3a8d3d99084..7b0caf91c25c4 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WCWidth.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WCWidth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -10,8 +10,7 @@
 
 public final class WCWidth {
 
-    private WCWidth() {
-    }
+    private WCWidth() {}
 
     /* The following two functions define the column width of an ISO 10646
      * character as follows:
@@ -44,88 +43,86 @@ private WCWidth() {
      * This implementation assumes that wchar_t characters are encoded
      * in ISO 10646.
      */
-    public static int wcwidth(int ucs)
-    {
+    public static int wcwidth(int ucs) {
 
         /* test for 8-bit control characters */
-        if (ucs == 0)
-            return 0;
-        if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
-            return -1;
+        if (ucs == 0) return 0;
+        if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return -1;
 
         /* binary search in table of non-spacing characters */
-        if (bisearch(ucs, combining, combining.length - 1))
-            return 0;
+        if (bisearch(ucs, combining, combining.length - 1)) return 0;
 
         /* if we arrive here, ucs is not a combining or C0/C1 control character */
-        return 1 +
-                ((ucs >= 0x1100 &&
-                        (ucs <= 0x115f ||                           /* Hangul Jamo init. consonants */
-                                ucs == 0x2329 || ucs == 0x232a ||
-                                (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-                                        ucs != 0x303f) ||           /* CJK ... Yi */
-                                (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
-                                (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-                                (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
-                                (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-                                (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
-                                (ucs >= 0xffe0 && ucs <= 0xffe6) ||
-                                (ucs >= 0x1f000 && ucs <= 0x1feee) ||
-                                (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-                                (ucs >= 0x30000 && ucs <= 0x3fffd))) ? 1 : 0);
+        return 1
+                + ((ucs >= 0x1100
+                                && (ucs <= 0x115f
+                                        || /* Hangul Jamo init. consonants */ ucs == 0x2329
+                                        || ucs == 0x232a
+                                        || (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs != 0x303f)
+                                        || /* CJK ... Yi */ (ucs >= 0xac00 && ucs <= 0xd7a3)
+                                        || /* Hangul Syllables */ (ucs >= 0xf900 && ucs <= 0xfaff)
+                                        || /* CJK Compatibility Ideographs */ (ucs >= 0xfe10 && ucs <= 0xfe19)
+                                        || /* Vertical forms */ (ucs >= 0xfe30 && ucs <= 0xfe6f)
+                                        || /* CJK Compatibility Forms */ (ucs >= 0xff00 && ucs <= 0xff60)
+                                        || /* Fullwidth Forms */ (ucs >= 0xffe0 && ucs <= 0xffe6)
+                                        || (ucs >= 0x1f000 && ucs <= 0x1feee)
+                                        || (ucs >= 0x20000 && ucs <= 0x2fffd)
+                                        || (ucs >= 0x30000 && ucs <= 0x3fffd)))
+                        ? 1
+                        : 0);
     }
 
     /* sorted list of non-overlapping intervals of non-spacing characters */
     /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
     static Interval[] combining = {
-            new Interval( 0x0300, 0x036F ), new Interval( 0x0483, 0x0486 ), new Interval( 0x0488, 0x0489 ),
-            new Interval( 0x0591, 0x05BD ), new Interval( 0x05BF, 0x05BF ), new Interval( 0x05C1, 0x05C2 ),
-            new Interval( 0x05C4, 0x05C5 ), new Interval( 0x05C7, 0x05C7 ), new Interval( 0x0600, 0x0603 ),
-            new Interval( 0x0610, 0x0615 ), new Interval( 0x064B, 0x065E ), new Interval( 0x0670, 0x0670 ),
-            new Interval( 0x06D6, 0x06E4 ), new Interval( 0x06E7, 0x06E8 ), new Interval( 0x06EA, 0x06ED ),
-            new Interval( 0x070F, 0x070F ), new Interval( 0x0711, 0x0711 ), new Interval( 0x0730, 0x074A ),
-            new Interval( 0x07A6, 0x07B0 ), new Interval( 0x07EB, 0x07F3 ), new Interval( 0x0901, 0x0902 ),
-            new Interval( 0x093C, 0x093C ), new Interval( 0x0941, 0x0948 ), new Interval( 0x094D, 0x094D ),
-            new Interval( 0x0951, 0x0954 ), new Interval( 0x0962, 0x0963 ), new Interval( 0x0981, 0x0981 ),
-            new Interval( 0x09BC, 0x09BC ), new Interval( 0x09C1, 0x09C4 ), new Interval( 0x09CD, 0x09CD ),
-            new Interval( 0x09E2, 0x09E3 ), new Interval( 0x0A01, 0x0A02 ), new Interval( 0x0A3C, 0x0A3C ),
-            new Interval( 0x0A41, 0x0A42 ), new Interval( 0x0A47, 0x0A48 ), new Interval( 0x0A4B, 0x0A4D ),
-            new Interval( 0x0A70, 0x0A71 ), new Interval( 0x0A81, 0x0A82 ), new Interval( 0x0ABC, 0x0ABC ),
-            new Interval( 0x0AC1, 0x0AC5 ), new Interval( 0x0AC7, 0x0AC8 ), new Interval( 0x0ACD, 0x0ACD ),
-            new Interval( 0x0AE2, 0x0AE3 ), new Interval( 0x0B01, 0x0B01 ), new Interval( 0x0B3C, 0x0B3C ),
-            new Interval( 0x0B3F, 0x0B3F ), new Interval( 0x0B41, 0x0B43 ), new Interval( 0x0B4D, 0x0B4D ),
-            new Interval( 0x0B56, 0x0B56 ), new Interval( 0x0B82, 0x0B82 ), new Interval( 0x0BC0, 0x0BC0 ),
-            new Interval( 0x0BCD, 0x0BCD ), new Interval( 0x0C3E, 0x0C40 ), new Interval( 0x0C46, 0x0C48 ),
-            new Interval( 0x0C4A, 0x0C4D ), new Interval( 0x0C55, 0x0C56 ), new Interval( 0x0CBC, 0x0CBC ),
-            new Interval( 0x0CBF, 0x0CBF ), new Interval( 0x0CC6, 0x0CC6 ), new Interval( 0x0CCC, 0x0CCD ),
-            new Interval( 0x0CE2, 0x0CE3 ), new Interval( 0x0D41, 0x0D43 ), new Interval( 0x0D4D, 0x0D4D ),
-            new Interval( 0x0DCA, 0x0DCA ), new Interval( 0x0DD2, 0x0DD4 ), new Interval( 0x0DD6, 0x0DD6 ),
-            new Interval( 0x0E31, 0x0E31 ), new Interval( 0x0E34, 0x0E3A ), new Interval( 0x0E47, 0x0E4E ),
-            new Interval( 0x0EB1, 0x0EB1 ), new Interval( 0x0EB4, 0x0EB9 ), new Interval( 0x0EBB, 0x0EBC ),
-            new Interval( 0x0EC8, 0x0ECD ), new Interval( 0x0F18, 0x0F19 ), new Interval( 0x0F35, 0x0F35 ),
-            new Interval( 0x0F37, 0x0F37 ), new Interval( 0x0F39, 0x0F39 ), new Interval( 0x0F71, 0x0F7E ),
-            new Interval( 0x0F80, 0x0F84 ), new Interval( 0x0F86, 0x0F87 ), new Interval( 0x0F90, 0x0F97 ),
-            new Interval( 0x0F99, 0x0FBC ), new Interval( 0x0FC6, 0x0FC6 ), new Interval( 0x102D, 0x1030 ),
-            new Interval( 0x1032, 0x1032 ), new Interval( 0x1036, 0x1037 ), new Interval( 0x1039, 0x1039 ),
-            new Interval( 0x1058, 0x1059 ), new Interval( 0x1160, 0x11FF ), new Interval( 0x135F, 0x135F ),
-            new Interval( 0x1712, 0x1714 ), new Interval( 0x1732, 0x1734 ), new Interval( 0x1752, 0x1753 ),
-            new Interval( 0x1772, 0x1773 ), new Interval( 0x17B4, 0x17B5 ), new Interval( 0x17B7, 0x17BD ),
-            new Interval( 0x17C6, 0x17C6 ), new Interval( 0x17C9, 0x17D3 ), new Interval( 0x17DD, 0x17DD ),
-            new Interval( 0x180B, 0x180D ), new Interval( 0x18A9, 0x18A9 ), new Interval( 0x1920, 0x1922 ),
-            new Interval( 0x1927, 0x1928 ), new Interval( 0x1932, 0x1932 ), new Interval( 0x1939, 0x193B ),
-            new Interval( 0x1A17, 0x1A18 ), new Interval( 0x1B00, 0x1B03 ), new Interval( 0x1B34, 0x1B34 ),
-            new Interval( 0x1B36, 0x1B3A ), new Interval( 0x1B3C, 0x1B3C ), new Interval( 0x1B42, 0x1B42 ),
-            new Interval( 0x1B6B, 0x1B73 ), new Interval( 0x1DC0, 0x1DCA ), new Interval( 0x1DFE, 0x1DFF ),
-            new Interval( 0x200B, 0x200F ), new Interval( 0x202A, 0x202E ), new Interval( 0x2060, 0x2063 ),
-            new Interval( 0x206A, 0x206F ), new Interval( 0x20D0, 0x20EF ), new Interval( 0x302A, 0x302F ),
-            new Interval( 0x3099, 0x309A ), new Interval( 0xA806, 0xA806 ), new Interval( 0xA80B, 0xA80B ),
-            new Interval( 0xA825, 0xA826 ), new Interval( 0xFB1E, 0xFB1E ), new Interval( 0xFE00, 0xFE0F ),
-            new Interval( 0xFE20, 0xFE23 ), new Interval( 0xFEFF, 0xFEFF ), new Interval( 0xFFF9, 0xFFFB ),
-            new Interval( 0x10A01, 0x10A03 ), new Interval( 0x10A05, 0x10A06 ), new Interval( 0x10A0C, 0x10A0F ),
-            new Interval( 0x10A38, 0x10A3A ), new Interval( 0x10A3F, 0x10A3F ), new Interval( 0x1D167, 0x1D169 ),
-            new Interval( 0x1D173, 0x1D182 ), new Interval( 0x1D185, 0x1D18B ), new Interval( 0x1D1AA, 0x1D1AD ),
-            new Interval( 0x1D242, 0x1D244 ), new Interval( 0x1F3FB, 0x1F3FF ), new Interval( 0xE0001, 0xE0001 ),
-            new Interval( 0xE0020, 0xE007F ), new Interval( 0xE0100, 0xE01EF )
+        new Interval(0x0300, 0x036F), new Interval(0x0483, 0x0486), new Interval(0x0488, 0x0489),
+        new Interval(0x0591, 0x05BD), new Interval(0x05BF, 0x05BF), new Interval(0x05C1, 0x05C2),
+        new Interval(0x05C4, 0x05C5), new Interval(0x05C7, 0x05C7), new Interval(0x0600, 0x0603),
+        new Interval(0x0610, 0x0615), new Interval(0x064B, 0x065E), new Interval(0x0670, 0x0670),
+        new Interval(0x06D6, 0x06E4), new Interval(0x06E7, 0x06E8), new Interval(0x06EA, 0x06ED),
+        new Interval(0x070F, 0x070F), new Interval(0x0711, 0x0711), new Interval(0x0730, 0x074A),
+        new Interval(0x07A6, 0x07B0), new Interval(0x07EB, 0x07F3), new Interval(0x0901, 0x0902),
+        new Interval(0x093C, 0x093C), new Interval(0x0941, 0x0948), new Interval(0x094D, 0x094D),
+        new Interval(0x0951, 0x0954), new Interval(0x0962, 0x0963), new Interval(0x0981, 0x0981),
+        new Interval(0x09BC, 0x09BC), new Interval(0x09C1, 0x09C4), new Interval(0x09CD, 0x09CD),
+        new Interval(0x09E2, 0x09E3), new Interval(0x0A01, 0x0A02), new Interval(0x0A3C, 0x0A3C),
+        new Interval(0x0A41, 0x0A42), new Interval(0x0A47, 0x0A48), new Interval(0x0A4B, 0x0A4D),
+        new Interval(0x0A70, 0x0A71), new Interval(0x0A81, 0x0A82), new Interval(0x0ABC, 0x0ABC),
+        new Interval(0x0AC1, 0x0AC5), new Interval(0x0AC7, 0x0AC8), new Interval(0x0ACD, 0x0ACD),
+        new Interval(0x0AE2, 0x0AE3), new Interval(0x0B01, 0x0B01), new Interval(0x0B3C, 0x0B3C),
+        new Interval(0x0B3F, 0x0B3F), new Interval(0x0B41, 0x0B43), new Interval(0x0B4D, 0x0B4D),
+        new Interval(0x0B56, 0x0B56), new Interval(0x0B82, 0x0B82), new Interval(0x0BC0, 0x0BC0),
+        new Interval(0x0BCD, 0x0BCD), new Interval(0x0C3E, 0x0C40), new Interval(0x0C46, 0x0C48),
+        new Interval(0x0C4A, 0x0C4D), new Interval(0x0C55, 0x0C56), new Interval(0x0CBC, 0x0CBC),
+        new Interval(0x0CBF, 0x0CBF), new Interval(0x0CC6, 0x0CC6), new Interval(0x0CCC, 0x0CCD),
+        new Interval(0x0CE2, 0x0CE3), new Interval(0x0D41, 0x0D43), new Interval(0x0D4D, 0x0D4D),
+        new Interval(0x0DCA, 0x0DCA), new Interval(0x0DD2, 0x0DD4), new Interval(0x0DD6, 0x0DD6),
+        new Interval(0x0E31, 0x0E31), new Interval(0x0E34, 0x0E3A), new Interval(0x0E47, 0x0E4E),
+        new Interval(0x0EB1, 0x0EB1), new Interval(0x0EB4, 0x0EB9), new Interval(0x0EBB, 0x0EBC),
+        new Interval(0x0EC8, 0x0ECD), new Interval(0x0F18, 0x0F19), new Interval(0x0F35, 0x0F35),
+        new Interval(0x0F37, 0x0F37), new Interval(0x0F39, 0x0F39), new Interval(0x0F71, 0x0F7E),
+        new Interval(0x0F80, 0x0F84), new Interval(0x0F86, 0x0F87), new Interval(0x0F90, 0x0F97),
+        new Interval(0x0F99, 0x0FBC), new Interval(0x0FC6, 0x0FC6), new Interval(0x102D, 0x1030),
+        new Interval(0x1032, 0x1032), new Interval(0x1036, 0x1037), new Interval(0x1039, 0x1039),
+        new Interval(0x1058, 0x1059), new Interval(0x1160, 0x11FF), new Interval(0x135F, 0x135F),
+        new Interval(0x1712, 0x1714), new Interval(0x1732, 0x1734), new Interval(0x1752, 0x1753),
+        new Interval(0x1772, 0x1773), new Interval(0x17B4, 0x17B5), new Interval(0x17B7, 0x17BD),
+        new Interval(0x17C6, 0x17C6), new Interval(0x17C9, 0x17D3), new Interval(0x17DD, 0x17DD),
+        new Interval(0x180B, 0x180D), new Interval(0x18A9, 0x18A9), new Interval(0x1920, 0x1922),
+        new Interval(0x1927, 0x1928), new Interval(0x1932, 0x1932), new Interval(0x1939, 0x193B),
+        new Interval(0x1A17, 0x1A18), new Interval(0x1B00, 0x1B03), new Interval(0x1B34, 0x1B34),
+        new Interval(0x1B36, 0x1B3A), new Interval(0x1B3C, 0x1B3C), new Interval(0x1B42, 0x1B42),
+        new Interval(0x1B6B, 0x1B73), new Interval(0x1DC0, 0x1DCA), new Interval(0x1DFE, 0x1DFF),
+        new Interval(0x200B, 0x200F), new Interval(0x202A, 0x202E), new Interval(0x2060, 0x2063),
+        new Interval(0x206A, 0x206F), new Interval(0x20D0, 0x20EF), new Interval(0x302A, 0x302F),
+        new Interval(0x3099, 0x309A), new Interval(0xA806, 0xA806), new Interval(0xA80B, 0xA80B),
+        new Interval(0xA825, 0xA826), new Interval(0xFB1E, 0xFB1E), new Interval(0xFE00, 0xFE0F),
+        new Interval(0xFE20, 0xFE23), new Interval(0xFEFF, 0xFEFF), new Interval(0xFFF9, 0xFFFB),
+        new Interval(0x10A01, 0x10A03), new Interval(0x10A05, 0x10A06), new Interval(0x10A0C, 0x10A0F),
+        new Interval(0x10A38, 0x10A3A), new Interval(0x10A3F, 0x10A3F), new Interval(0x1D167, 0x1D169),
+        new Interval(0x1D173, 0x1D182), new Interval(0x1D185, 0x1D18B), new Interval(0x1D1AA, 0x1D1AD),
+        new Interval(0x1D242, 0x1D244), new Interval(0x1F3FB, 0x1F3FF), new Interval(0xE0001, 0xE0001),
+        new Interval(0xE0020, 0xE007F), new Interval(0xE0100, 0xE01EF)
     };
 
     private static class Interval {
@@ -143,20 +140,14 @@ private static boolean bisearch(int ucs, Interval[] table, int max) {
         int min = 0;
         int mid;
 
-        if (ucs < table[0].first || ucs > table[max].last)
-            return false;
+        if (ucs < table[0].first || ucs > table[max].last) return false;
         while (max >= min) {
             mid = (min + max) / 2;
-            if (ucs > table[mid].last)
-                min = mid + 1;
-            else if (ucs < table[mid].first)
-                max = mid - 1;
-            else
-                return true;
+            if (ucs > table[mid].last) min = mid + 1;
+            else if (ucs < table[mid].first) max = mid - 1;
+            else return true;
         }
 
         return false;
     }
-
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WriterOutputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WriterOutputStream.java
index 3ad63a8f38133..b1285f9636ea5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WriterOutputStream.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WriterOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -35,9 +35,11 @@ public class WriterOutputStream extends OutputStream {
     private final CharBuffer decoderOut = CharBuffer.allocate(128);
 
     public WriterOutputStream(Writer out, Charset charset) {
-        this(out, charset.newDecoder()
-                .onMalformedInput(CodingErrorAction.REPLACE)
-                .onUnmappableCharacter(CodingErrorAction.REPLACE));
+        this(
+                out,
+                charset.newDecoder()
+                        .onMalformedInput(CodingErrorAction.REPLACE)
+                        .onUnmappableCharacter(CodingErrorAction.REPLACE));
     }
 
     public WriterOutputStream(Writer out, CharsetDecoder decoder) {
@@ -47,7 +49,7 @@ public WriterOutputStream(Writer out, CharsetDecoder decoder) {
 
     @Override
     public void write(int b) throws IOException {
-        write(new byte[] { (byte)b }, 0, 1);
+        write(new byte[] {(byte) b}, 0, 1);
     }
 
     @Override
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/windows-conemu.caps b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/windows-conemu.caps
index 719bcf8620296..f5caa4402bcc6 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/windows-conemu.caps
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/windows-conemu.caps
@@ -5,6 +5,9 @@ windows-conemu|conemu windows terminal,
 	cr=^M, cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	cuu=\E[%p1%dA, cuu1=\E[A,
+	civis=\E[?25l, cvvis=\E[?25h,
+	smcup=\E[?1049h, rmcup=\E[?1049l,
+	rc=\E8, sc=\E7,
 	il=\E[%p1%dL, il1=\E[L,
 	dl=\E[%p1%dM, dl1=\E[M,
 	ech=\E[%p1%dX,
diff --git a/src/jdk.internal.le/share/legal/jline.md b/src/jdk.internal.le/share/legal/jline.md
index 6840c69cfc02b..5b813c0af2faf 100644
--- a/src/jdk.internal.le/share/legal/jline.md
+++ b/src/jdk.internal.le/share/legal/jline.md
@@ -1,9 +1,9 @@
-## JLine v3.22.0
+## JLine v3.26.1
 
 ### JLine License
 <pre>
 
-Copyright (c) 2002-2018, the original author or authors.
+Copyright (c) 2002-2023, the original author or authors.
 All rights reserved.
 
 https://opensource.org/licenses/BSD-3-Clause
diff --git a/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaNativePty.java b/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaNativePty.java
deleted file mode 100644
index 2cf24e4ba8575..0000000000000
--- a/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaNativePty.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna;
-
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Constructor;
-
-//import com.sun.jna.Platform;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.AbstractPty;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-import jdk.internal.org.jline.terminal.spi.Pty;
-//import jdk.internal.org.jline.terminal.impl.jna.freebsd.FreeBsdNativePty;
-//import jdk.internal.org.jline.terminal.impl.jna.linux.LinuxNativePty;
-//import jdk.internal.org.jline.terminal.impl.jna.osx.OsXNativePty;
-//import jdk.internal.org.jline.terminal.impl.jna.solaris.SolarisNativePty;
-
-public abstract class JnaNativePty extends AbstractPty implements Pty {
-
-    private final int master;
-    private final int slave;
-    private final int slaveOut;
-    private final String name;
-    private final FileDescriptor masterFD;
-    private final FileDescriptor slaveFD;
-    private final FileDescriptor slaveOutFD;
-
-    public static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-//        if (Platform.isMac()) {
-//            if (Platform.is64Bit() && Platform.isARM()) {
-//                throw new UnsupportedOperationException();
-//            }
-//            return OsXNativePty.current(console);
-//        } else if (Platform.isLinux()) {
-//            return LinuxNativePty.current(console);
-//        } else if (Platform.isSolaris()) {
-//            return SolarisNativePty.current(console);
-//        } else if (Platform.isFreeBSD()) {
-//            return FreeBsdNativePty.current(console);
-//        } else {
-//            throw new UnsupportedOperationException();
-//        }
-        return JDKNativePty.current(console);
-    }
-
-    public static JnaNativePty open(Attributes attr, Size size) throws IOException {
-//        if (Platform.isMac()) {
-//            return OsXNativePty.open(attr, size);
-//        } else if (Platform.isLinux()) {
-//            return LinuxNativePty.open(attr, size);
-//        } else if (Platform.isSolaris()) {
-//            return SolarisNativePty.open(attr, size);
-//        } else if (Platform.isFreeBSD()) {
-//            return FreeBsdNativePty.open(attr, size);
-//        } else {
-//            throw new UnsupportedOperationException();
-//        }
-        return JDKNativePty.open(attr, size);
-    }
-
-    protected JnaNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, String name) {
-        this(master, masterFD, slave, slaveFD, slave, slaveFD, name);
-    }
-
-    protected JnaNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, int slaveOut, FileDescriptor slaveOutFD, String name) {
-        this.master = master;
-        this.slave = slave;
-        this.slaveOut = slaveOut;
-        this.name = name;
-        this.masterFD = masterFD;
-        this.slaveFD = slaveFD;
-        this.slaveOutFD = slaveOutFD;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (master > 0) {
-            getMasterInput().close();
-        }
-        if (slave > 0) {
-            getSlaveInput().close();
-        }
-    }
-
-    public int getMaster() {
-        return master;
-    }
-
-    public int getSlave() {
-        return slave;
-    }
-
-    public int getSlaveOut() {
-        return slaveOut;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public FileDescriptor getMasterFD() {
-        return masterFD;
-    }
-
-    public FileDescriptor getSlaveFD() {
-        return slaveFD;
-    }
-
-    public FileDescriptor getSlaveOutFD() {
-        return slaveOutFD;
-    }
-
-    public InputStream getMasterInput() {
-        return new FileInputStream(getMasterFD());
-    }
-
-    public OutputStream getMasterOutput() {
-        return new FileOutputStream(getMasterFD());
-    }
-
-    protected InputStream doGetSlaveInput() {
-        return new FileInputStream(getSlaveFD());
-    }
-
-    public OutputStream getSlaveOutput() {
-        return new FileOutputStream(getSlaveOutFD());
-    }
-
-    protected static FileDescriptor newDescriptor(int fd) {
-        try {
-            Constructor<FileDescriptor> cns = FileDescriptor.class.getDeclaredConstructor(int.class);
-            cns.setAccessible(true);
-            return cns.newInstance(fd);
-        } catch (Throwable e) {
-            throw new RuntimeException("Unable to create FileDescriptor", e);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "JnaNativePty[" + getName() + "]";
-    }
-
-    public static boolean isPosixSystemStream(TerminalProvider.Stream stream) {
-        switch (stream) {
-            case Input: return isatty(0);
-            case Output: return isatty(1);
-            case Error: return isatty(2);
-            default: return false;
-        }
-    }
-
-    public static String posixSystemStreamName(TerminalProvider.Stream stream) {
-        switch (stream) {
-            case Input: return ttyname(0);
-            case Output: return ttyname(1);
-            case Error: return ttyname(2);
-            default: return null;
-        }
-    }
-
-    private static boolean isatty(int fd) {
-//        if (Platform.isMac()) {
-//            return OsXNativePty.isatty(fd) == 1;
-//        } else if (Platform.isLinux()) {
-//            return LinuxNativePty.isatty(fd) == 1;
-//        } else if (Platform.isSolaris()) {
-//            return SolarisNativePty.isatty(fd) == 1;
-//        } else if (Platform.isFreeBSD()) {
-//            return FreeBsdNativePty.isatty(fd) == 1;
-//        } else {
-//            return false;
-//        }
-        return JDKNativePty.isatty(fd) == 1;
-    }
-
-    private static String ttyname(int fd) {
-//        if (Platform.isMac()) {
-//            return OsXNativePty.ttyname(fd);
-//        } else if (Platform.isLinux()) {
-//            return LinuxNativePty.ttyname(fd);
-//        } else if (Platform.isSolaris()) {
-//            return SolarisNativePty.ttyname(fd);
-//        } else if (Platform.isFreeBSD()) {
-//            return FreeBsdNativePty.ttyname(fd);
-//        } else {
-//            return null;
-//        }
-        return JDKNativePty.ttyname(fd);
-    }
-
-}
diff --git a/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java b/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
deleted file mode 100644
index 04052202030f7..0000000000000
--- a/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna;
-
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.terminal.impl.PosixPtyTerminal;
-import jdk.internal.org.jline.terminal.impl.PosixSysTerminal;
-//import jdk.internal.org.jline.terminal.impl.jna.win.JnaWinSysTerminal;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-import jdk.internal.org.jline.terminal.spi.Pty;
-import jdk.internal.org.jline.utils.OSUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.function.Function;
-
-public class JnaTerminalProvider implements TerminalProvider
-{
-    @Override
-    public String name() {
-        return "jna";
-    }
-
-    public Pty current(TerminalProvider.Stream console) throws IOException {
-        return JnaNativePty.current(console);
-    }
-
-    public Pty open(Attributes attributes, Size size) throws IOException {
-        return JnaNativePty.open(attributes, size);
-    }
-
-    @Override
-    public Terminal sysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-//        if (OSUtils.IS_WINDOWS) {
-//            return winSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream );
-//        } else {
-            return posixSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream, inputStreamWrapper );
-//        }
-    }
-
-//    public Terminal winSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-//                                   boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-//                                   Stream console, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-//        return JnaWinSysTerminal.createTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, console);
-//    }
-//
-    public Terminal posixSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                     boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                     Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-//        Pty pty = jdk.internal.org.jline.terminal.impl.ExecPty.current(consoleStream);
-        Pty pty = current(consoleStream);
-        return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler, inputStreamWrapper);
-    }
-
-    @Override
-    public Terminal newTerminal(String name, String type, InputStream in, OutputStream out,
-                                Charset encoding, Terminal.SignalHandler signalHandler, boolean paused,
-                                Attributes attributes, Size size) throws IOException
-    {
-        Pty pty = open(attributes, size);
-        return new PosixPtyTerminal(name, type, pty, in, out, encoding, signalHandler, paused);
-    }
-
-    @Override
-    public boolean isSystemStream(Stream stream) {
-        try {
-//            if (OSUtils.IS_WINDOWS) {
-//                return isWindowsSystemStream(stream);
-//            } else {
-                return isPosixSystemStream(stream);
-//            }
-        } catch (Throwable t) {
-            return false;
-        }
-    }
-
-//    public boolean isWindowsSystemStream(Stream stream) {
-//        return JnaWinSysTerminal.isWindowsSystemStream(stream);
-//    }
-
-    public boolean isPosixSystemStream(Stream stream) {
-        return JnaNativePty.isPosixSystemStream(stream);
-    }
-
-    @Override
-    public String systemStreamName(Stream stream) {
-        if (OSUtils.IS_WINDOWS) {
-            return null;
-        } else {
-            return JnaNativePty.posixSystemStreamName(stream);
-        }
-    }
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
deleted file mode 100644
index b820ce2187efe..0000000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna;
-
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.terminal.impl.PosixPtyTerminal;
-import jdk.internal.org.jline.terminal.impl.PosixSysTerminal;
-import jdk.internal.org.jline.terminal.impl.jna.win.JnaWinSysTerminal;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-import jdk.internal.org.jline.terminal.spi.Pty;
-import jdk.internal.org.jline.utils.OSUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.function.Function;
-
-public class JnaTerminalProvider implements TerminalProvider
-{
-    @Override
-    public String name() {
-        return "jna";
-    }
-
-//    public Pty current(TerminalProvider.Stream console) throws IOException {
-//        return JnaNativePty.current(console);
-//    }
-//
-//    public Pty open(Attributes attributes, Size size) throws IOException {
-//        return JnaNativePty.open(attributes, size);
-//    }
-
-    @Override
-    public Terminal sysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        if (OSUtils.IS_WINDOWS) {
-            return winSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream, inputStreamWrapper );
-        } else {
-            return null;
-        }
-    }
-
-    public Terminal winSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                   boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                   Stream console, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        return JnaWinSysTerminal.createTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, console, inputStreamWrapper);
-    }
-
-//    public Terminal posixSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-//                                     boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-//                                     Stream consoleStream) throws IOException {
-//        Pty pty = current(consoleStream);
-//        return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler);
-//    }
-
-    @Override
-    public Terminal newTerminal(String name, String type, InputStream in, OutputStream out,
-                                Charset encoding, Terminal.SignalHandler signalHandler, boolean paused,
-                                Attributes attributes, Size size) throws IOException
-    {
-//        Pty pty = open(attributes, size);
-//        return new PosixPtyTerminal(name, type, pty, in, out, encoding, signalHandler, paused);
-        return null;
-    }
-
-    @Override
-    public boolean isSystemStream(Stream stream) {
-        try {
-            if (OSUtils.IS_WINDOWS) {
-                return isWindowsSystemStream(stream);
-            } else {
-//                return isPosixSystemStream(stream);
-                return false;
-            }
-        } catch (Throwable t) {
-            return false;
-        }
-    }
-
-    public boolean isWindowsSystemStream(Stream stream) {
-        return JnaWinSysTerminal.isWindowsSystemStream(stream);
-    }
-
-//    public boolean isPosixSystemStream(Stream stream) {
-//        return JnaNativePty.isPosixSystemStream(stream);
-//    }
-
-    @Override
-    public String systemStreamName(Stream stream) {
-//        if (OSUtils.IS_WINDOWS) {
-            return null;
-//        } else {
-//            return JnaNativePty.posixSystemStreamName(stream);
-//        }
-    }
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/IntByReference.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/IntByReference.java
deleted file mode 100644
index 7cfe401b58267..0000000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/IntByReference.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.org.jline.terminal.impl.jna.win;
-
-class IntByReference {
-
-    public int value;
-
-    public int getValue() {
-        return value;
-    }
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java
deleted file mode 100644
index 7fcbb5416a697..0000000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2002-2017, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.win;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Pointer;
-//import com.sun.jna.ptr.IntByReference;
-import jdk.internal.org.jline.terminal.impl.AbstractWindowsConsoleWriter;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-import java.io.IOException;
-
-class JnaWinConsoleWriter extends AbstractWindowsConsoleWriter {
-
-    private final Pointer console;
-    private final IntByReference writtenChars = new IntByReference();
-
-    JnaWinConsoleWriter(Pointer console) {
-        this.console = console;
-    }
-
-    @Override
-    protected void writeConsole(char[] text, int len) throws IOException {
-        try {
-            Kernel32.INSTANCE.WriteConsoleW(this.console, text, len, this.writtenChars, null);
-        } catch (LastErrorException e) {
-            throw new IOException("Failed to write to console", e);
-        }
-    }
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
deleted file mode 100644
index 9baafb89bd954..0000000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.win;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.util.function.Function;
-import java.util.function.IntConsumer;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Pointer;
-//import com.sun.jna.ptr.IntByReference;
-import jdk.internal.org.jline.terminal.Cursor;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-import jdk.internal.org.jline.utils.InfoCmp;
-import jdk.internal.org.jline.utils.OSUtils;
-
-public class JnaWinSysTerminal extends AbstractWindowsTerminal {
-
-    private static final Pointer consoleIn = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_INPUT_HANDLE);
-    private static final Pointer consoleOut = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_OUTPUT_HANDLE);
-    private static final Pointer consoleErr = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_ERROR_HANDLE);
-
-    public static JnaWinSysTerminal createTerminal(String name, String type, boolean ansiPassThrough, Charset encoding, boolean nativeSignals, SignalHandler signalHandler, boolean paused, TerminalProvider.Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        Pointer console;
-        switch (consoleStream) {
-            case Output:
-                console = JnaWinSysTerminal.consoleOut;
-                break;
-            case Error:
-                console = JnaWinSysTerminal.consoleErr;
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + consoleStream);
-        }
-        Writer writer;
-        if (ansiPassThrough) {
-            if (type == null) {
-                type = OSUtils.IS_CONEMU ? TYPE_WINDOWS_CONEMU : TYPE_WINDOWS;
-            }
-            writer = new JnaWinConsoleWriter(console);
-        } else {
-            IntByReference mode = new IntByReference();
-            Kernel32.INSTANCE.GetConsoleMode(console, mode);
-            try {
-                Kernel32.INSTANCE.SetConsoleMode(console, mode.getValue() | AbstractWindowsTerminal.ENABLE_VIRTUAL_TERMINAL_PROCESSING);
-                if (type == null) {
-                    type = TYPE_WINDOWS_VTP;
-                }
-                writer = new JnaWinConsoleWriter(console);
-            } catch (LastErrorException e) {
-                if (OSUtils.IS_CONEMU) {
-                    if (type == null) {
-                        type = TYPE_WINDOWS_CONEMU;
-                    }
-                    writer = new JnaWinConsoleWriter(console);
-                } else {
-                    if (type == null) {
-                        type = TYPE_WINDOWS;
-                    }
-                    writer = new WindowsAnsiWriter(new BufferedWriter(new JnaWinConsoleWriter(console)), console);
-                }
-            }
-        }
-        JnaWinSysTerminal terminal = new JnaWinSysTerminal(writer, name, type, encoding, nativeSignals, signalHandler, inputStreamWrapper);
-        // Start input pump thread
-        if (!paused) {
-            terminal.resume();
-        }
-        return terminal;
-    }
-
-    public static boolean isWindowsSystemStream(TerminalProvider.Stream stream) {
-        try {
-            IntByReference mode = new IntByReference();
-            Pointer console;
-            switch (stream) {
-                case Input: console = consoleIn; break;
-                case Output: console = consoleOut; break;
-                case Error: console = consoleErr; break;
-                default: return false;
-            }
-            Kernel32.INSTANCE.GetConsoleMode(console, mode);
-            return true;
-        } catch (LastErrorException e) {
-            return false;
-        }
-    }
-
-    JnaWinSysTerminal(Writer writer, String name, String type, Charset encoding, boolean nativeSignals, SignalHandler signalHandler,
-            Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        super(writer, name, type, encoding, nativeSignals, signalHandler, inputStreamWrapper);
-        strings.put(InfoCmp.Capability.key_mouse, "\\E[M");
-    }
-
-    @Override
-    protected int getConsoleMode() {
-        IntByReference mode = new IntByReference();
-        Kernel32.INSTANCE.GetConsoleMode(consoleIn, mode);
-        return mode.getValue();
-    }
-
-    @Override
-    protected void setConsoleMode(int mode) {
-        Kernel32.INSTANCE.SetConsoleMode(consoleIn, mode);
-    }
-
-    public Size getSize() {
-        Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
-        Kernel32.INSTANCE.GetConsoleScreenBufferInfo(consoleOut, info);
-        return new Size(info.windowWidth(), info.windowHeight());
-    }
-
-    public Size getBufferSize() {
-        Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
-        Kernel32.INSTANCE.GetConsoleScreenBufferInfo(consoleOut, info);
-        return new Size(info.dwSize.X, info.dwSize.Y);
-    }
-
-    protected boolean processConsoleInput() throws IOException {
-        Kernel32.INPUT_RECORD event = readConsoleInput(100);
-        if (event == null) {
-            return false;
-        }
-
-        switch (event.EventType) {
-            case Kernel32.INPUT_RECORD.KEY_EVENT:
-                processKeyEvent(event.Event.KeyEvent);
-                return true;
-            case Kernel32.INPUT_RECORD.WINDOW_BUFFER_SIZE_EVENT:
-                raise(Signal.WINCH);
-                return false;
-            case Kernel32.INPUT_RECORD.MOUSE_EVENT:
-                processMouseEvent(event.Event.MouseEvent);
-                return true;
-            case Kernel32.INPUT_RECORD.FOCUS_EVENT:
-                processFocusEvent(event.Event.FocusEvent.bSetFocus);
-                return true;
-            default:
-                // Skip event
-                return false;
-        }
-    }
-
-    private void processKeyEvent(Kernel32.KEY_EVENT_RECORD keyEvent) throws IOException {
-        processKeyEvent(keyEvent.bKeyDown, keyEvent.wVirtualKeyCode, keyEvent.uChar.UnicodeChar, keyEvent.dwControlKeyState);
-    }
-
-    private char[] focus = new char[] { '\033', '[', ' ' };
-
-    private void processFocusEvent(boolean hasFocus) throws IOException {
-        if (focusTracking) {
-            focus[2] = hasFocus ? 'I' : 'O';
-            slaveInputPipe.write(focus);
-        }
-    }
-
-    private char[] mouse = new char[] { '\033', '[', 'M', ' ', ' ', ' ' };
-
-    private void processMouseEvent(Kernel32.MOUSE_EVENT_RECORD mouseEvent) throws IOException {
-        int dwEventFlags = mouseEvent.dwEventFlags;
-        int dwButtonState = mouseEvent.dwButtonState;
-        if (tracking == MouseTracking.Off
-                || tracking == MouseTracking.Normal && dwEventFlags == Kernel32.MOUSE_MOVED
-                || tracking == MouseTracking.Button && dwEventFlags == Kernel32.MOUSE_MOVED && dwButtonState == 0) {
-            return;
-        }
-        int cb = 0;
-        dwEventFlags &= ~ Kernel32.DOUBLE_CLICK; // Treat double-clicks as normal
-        if (dwEventFlags == Kernel32.MOUSE_WHEELED) {
-            cb |= 64;
-            if ((dwButtonState >> 16) < 0) {
-                cb |= 1;
-            }
-        } else if (dwEventFlags == Kernel32.MOUSE_HWHEELED) {
-            return;
-        } else if ((dwButtonState & Kernel32.FROM_LEFT_1ST_BUTTON_PRESSED) != 0) {
-            cb |= 0x00;
-        } else if ((dwButtonState & Kernel32.RIGHTMOST_BUTTON_PRESSED) != 0) {
-            cb |= 0x01;
-        } else if ((dwButtonState & Kernel32.FROM_LEFT_2ND_BUTTON_PRESSED) != 0) {
-            cb |= 0x02;
-        } else {
-            cb |= 0x03;
-        }
-        int cx = mouseEvent.dwMousePosition.X;
-        int cy = mouseEvent.dwMousePosition.Y;
-        mouse[3] = (char) (' ' + cb);
-        mouse[4] = (char) (' ' + cx + 1);
-        mouse[5] = (char) (' ' + cy + 1);
-        slaveInputPipe.write(mouse);
-    }
-
-    private final Kernel32.INPUT_RECORD[] inputEvents = new Kernel32.INPUT_RECORD[1];
-    private final IntByReference eventsRead = new IntByReference();
-
-    private Kernel32.INPUT_RECORD readConsoleInput(int dwMilliseconds) throws IOException {
-        if (Kernel32.INSTANCE.WaitForSingleObject(consoleIn, dwMilliseconds) != 0) {
-            return null;
-        }
-        Kernel32.INSTANCE.ReadConsoleInput(consoleIn, inputEvents, 1, eventsRead);
-        if (eventsRead.getValue() == 1) {
-            return inputEvents[0];
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Cursor getCursorPosition(IntConsumer discarded) {
-        Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
-        Kernel32.INSTANCE.GetConsoleScreenBufferInfo(consoleOut, info);
-        return new Cursor(info.dwCursorPosition.X, info.dwCursorPosition.Y);
-    }
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32.java
deleted file mode 100644
index 20c6eefeeced2..0000000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32.java
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * Copyright (c) 2002-2018, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.win;
-
-//OpenJDK changes:
-//-references to JNA types commented out
-//-replacement types provided where needed (IntByReference, LastErrorException, Pointer)
-//-methods not used by JLine commented out
-//-provided an implementation of the interface (Kernel32Impl), backed by a native implementation (Kernel32.cpp)
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Native;
-//import com.sun.jna.Pointer;
-//import com.sun.jna.Structure;
-//import com.sun.jna.Union;
-//import com.sun.jna.ptr.IntByReference;
-//import com.sun.jna.win32.StdCallLibrary;
-//import com.sun.jna.win32.W32APIOptions;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-interface Kernel32 {//extends StdCallLibrary {
-
-    Kernel32 INSTANCE = new Kernel32Impl();
-//    Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
-
-//    Pointer INVALID_HANDLE_VALUE = Pointer.createConstant(-1L);
-
-    int STD_INPUT_HANDLE =  -10;
-    int STD_OUTPUT_HANDLE = -11;
-    int STD_ERROR_HANDLE =  -12;
-
-    int ENABLE_PROCESSED_INPUT =    0x0001;
-    int ENABLE_LINE_INPUT =         0x0002;
-    int ENABLE_ECHO_INPUT =         0x0004;
-    int ENABLE_WINDOW_INPUT =       0x0008;
-    int ENABLE_MOUSE_INPUT =        0x0010;
-    int ENABLE_INSERT_MODE =        0x0020;
-    int ENABLE_QUICK_EDIT_MODE =    0x0040;
-    int ENABLE_EXTENDED_FLAGS =     0x0080;
-
-    int RIGHT_ALT_PRESSED =     0x0001;
-    int LEFT_ALT_PRESSED =      0x0002;
-    int RIGHT_CTRL_PRESSED =    0x0004;
-    int LEFT_CTRL_PRESSED =     0x0008;
-    int SHIFT_PRESSED =         0x0010;
-
-    int FOREGROUND_BLUE =       0x0001;
-    int FOREGROUND_GREEN =      0x0002;
-    int FOREGROUND_RED =        0x0004;
-    int FOREGROUND_INTENSITY =  0x0008;
-    int BACKGROUND_BLUE =       0x0010;
-    int BACKGROUND_GREEN =      0x0020;
-    int BACKGROUND_RED =        0x0040;
-    int BACKGROUND_INTENSITY =  0x0080;
-
-    // Button state
-    int FROM_LEFT_1ST_BUTTON_PRESSED = 0x0001;
-    int RIGHTMOST_BUTTON_PRESSED     = 0x0002;
-    int FROM_LEFT_2ND_BUTTON_PRESSED = 0x0004;
-    int FROM_LEFT_3RD_BUTTON_PRESSED = 0x0008;
-    int FROM_LEFT_4TH_BUTTON_PRESSED = 0x0010;
-
-    // Event flags
-    int MOUSE_MOVED                  = 0x0001;
-    int DOUBLE_CLICK                 = 0x0002;
-    int MOUSE_WHEELED                = 0x0004;
-    int MOUSE_HWHEELED               = 0x0008;
-
-    // DWORD WINAPI WaitForSingleObject(
-    //  _In_ HANDLE hHandle,
-    //  _In_ DWORD  dwMilliseconds
-    // );
-    int WaitForSingleObject(Pointer in_hHandle, int in_dwMilliseconds);
-
-    // HANDLE WINAPI GetStdHandle(
-    // __in DWORD nStdHandle
-    // );
-    Pointer GetStdHandle(int nStdHandle);
-
-//    // BOOL WINAPI AllocConsole(void);
-//    void AllocConsole() throws LastErrorException;
-//
-//    // BOOL WINAPI FreeConsole(void);
-//    void FreeConsole() throws LastErrorException;
-//
-//    // HWND WINAPI GetConsoleWindow(void);
-//    Pointer GetConsoleWindow();
-//
-//    // UINT WINAPI GetConsoleCP(void)
-//    int GetConsoleCP();
-//
-    // UINT WINAPI GetConsoleOutputCP(void)
-    int GetConsoleOutputCP();
-
-    // BOOL WINAPI FillConsoleOutputCharacter(
-    // _In_ HANDLE hConsoleOutput,
-    // _In_ TCHAR cCharacter,
-    // _In_ DWORD nLength,
-    // _In_ COORD dwWriteCoord,
-    // _Out_ LPDWORD lpNumberOfCharsWritten);
-    void FillConsoleOutputCharacter(Pointer in_hConsoleOutput,
-                                    char in_cCharacter, int in_nLength, COORD in_dwWriteCoord,
-                                    IntByReference out_lpNumberOfCharsWritten)
-            throws LastErrorException;
-
-    // BOOL WINAPI FillConsoleOutputAttribute(
-    // _In_ HANDLE hConsoleOutput,
-    // _In_ WORD wAttribute,
-    // _In_ DWORD nLength,
-    // _In_ COORD dwWriteCoord,
-    // _Out_ LPDWORD lpNumberOfAttrsWritten);
-    void FillConsoleOutputAttribute(Pointer in_hConsoleOutput,
-                                    short in_wAttribute, int in_nLength, COORD in_dwWriteCoord,
-                                    IntByReference out_lpNumberOfAttrsWritten)
-            throws LastErrorException;
-//
-////    // BOOL WINAPI GetConsoleCursorInfo(
-////    // _In_ HANDLE hConsoleOutput,
-////    // _Out_ PCONSOLE_CURSOR_INFO lpConsoleCursorInfo);
-////    void GetConsoleCursorInfo(Pointer in_hConsoleOutput,
-////                              CONSOLE_CURSOR_INFO.ByReference out_lpConsoleCursorInfo)
-////            throws LastErrorException;
-//
-    // BOOL WINAPI GetConsoleMode(
-    //   _In_   HANDLE hConsoleHandle,
-    //   _Out_  LPDWORD lpMode);
-    void GetConsoleMode(
-            Pointer in_hConsoleOutput,
-            IntByReference out_lpMode)
-            throws LastErrorException;
-
-    // BOOL WINAPI GetConsoleScreenBufferInfo(
-    // _In_   HANDLE hConsoleOutput,
-    // _Out_  PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo);
-    void GetConsoleScreenBufferInfo(
-            Pointer in_hConsoleOutput,
-            CONSOLE_SCREEN_BUFFER_INFO out_lpConsoleScreenBufferInfo)
-            throws LastErrorException;
-//
-//    // BOOL WINAPI GetNumberOfConsoleInputEvents(
-//    // _In_ HANDLE hConsoleInput,
-//    // _Out_ LPDWORD lpcNumberOfEvents);
-//    void GetNumberOfConsoleInputEvents(Pointer in_hConsoleOutput,
-//                                       IntByReference out_lpcNumberOfEvents) throws LastErrorException;
-//
-    // BOOL WINAPI ReadConsoleInput(
-    // _In_ HANDLE hConsoleInput,
-    // _Out_ PINPUT_RECORD lpBuffer,
-    // _In_ DWORD nLength,
-    // _Out_ LPDWORD lpNumberOfEventsRead);
-    void ReadConsoleInput(Pointer in_hConsoleOutput,
-                          INPUT_RECORD[] out_lpBuffer, int in_nLength,
-                          IntByReference out_lpNumberOfEventsRead) throws LastErrorException;
-
-//    // BOOL WINAPI SetConsoleCtrlHandler(
-//    // _In_opt_  PHANDLER_ROUTINE HandlerRoutine,
-//    // _In_      BOOL Add);
-//    void SetConsoleCtrlHandler(
-//            Pointer in_opt_HandlerRoutine,
-//            boolean in_Add)
-//            throws LastErrorException;
-//
-//    // BOOL WINAPI ReadConsoleOutput(
-//    // _In_     HANDLE hConsoleOutput,
-//    // _Out_    PCHAR_INFO lpBuffer,
-//    // _In_     COORD dwBufferSize,
-//    // _In_     COORD dwBufferCoord,
-//    // _Inout_  PSMALL_RECT lpReadRegion);
-////    void ReadConsoleOutput(Pointer in_hConsoleOutput, CHAR_INFO[] out_lpBuffer,
-////                           COORD in_dwBufferSize, COORD in_dwBufferCoord,
-////                           SMALL_RECT inout_lpReadRegion) throws LastErrorException;
-////    void ReadConsoleOutputA(Pointer in_hConsoleOutput, CHAR_INFO[] out_lpBuffer,
-////                            COORD in_dwBufferSize, COORD in_dwBufferCoord,
-////                            SMALL_RECT inout_lpReadRegion) throws LastErrorException;
-//
-//    // BOOL WINAPI ReadConsoleOutputCharacter(
-//    // _In_   HANDLE hConsoleOutput,
-//    // _Out_  LPTSTR lpCharacter,
-//    // _In_   DWORD nLength,
-//    // _In_   COORD dwReadCoord,
-//    // _Out_  LPDWORD lpNumberOfCharsRead);
-//    void ReadConsoleOutputCharacter(Pointer in_hConsoleOutput,
-//                                    char[] ouy_lpCharacter, int in_nLength, COORD in_dwReadCoord,
-//                                    IntByReference out_lpNumberOfCharsRead)
-//            throws LastErrorException;
-//    void ReadConsoleOutputCharacterA(Pointer in_hConsoleOutput,
-//                                     byte[] ouy_lpCharacter, int in_nLength, COORD in_dwReadCoord,
-//                                     IntByReference out_lpNumberOfCharsRead)
-//            throws LastErrorException;
-//
-//    // BOOL WINAPI SetConsoleCursorInfo(
-//    // _In_ HANDLE hConsoleOutput,
-//    // _In_ const CONSOLE_CURSOR_INFO *lpConsoleCursorInfo);
-//    void SetConsoleCursorInfo(Pointer in_hConsoleOutput,
-//                              CONSOLE_CURSOR_INFO in_lpConsoleCursorInfo)
-//            throws LastErrorException;
-//
-//    // BOOL WINAPI SetConsoleCP(
-//    // _In_ UINT wCodePageID);
-//    void SetConsoleCP(int in_wCodePageID) throws LastErrorException;
-//
-//    // BOOL WINAPI SetConsoleOutputCP(
-//    // _In_ UINT wCodePageID);
-//    void SetConsoleOutputCP(int in_wCodePageID) throws LastErrorException;
-//
-    // BOOL WINAPI SetConsoleCursorPosition(
-    // _In_ HANDLE hConsoleOutput,
-    // _In_ COORD dwCursorPosition);
-    void SetConsoleCursorPosition(Pointer in_hConsoleOutput,
-                                  COORD in_dwCursorPosition) throws LastErrorException;
-
-    // BOOL WINAPI SetConsoleMode(
-    //   _In_  HANDLE hConsoleHandle,
-    //   _In_  DWORD dwMode);
-    void SetConsoleMode(
-            Pointer in_hConsoleOutput,
-            int in_dwMode) throws LastErrorException;
-
-//    // BOOL WINAPI SetConsoleScreenBufferSize(
-//    // __in HANDLE hConsoleOutput,
-//    // __in COORD dwSize
-//    // );
-//    void SetConsoleScreenBufferSize(Pointer in_hConsoleOutput,
-//                                    COORD in_dwSize) throws LastErrorException;
-//
-    // BOOL WINAPI SetConsoleTextAttribute(
-    // _In_ HANDLE hConsoleOutput,
-    // _In_ WORD   wAttributes
-    // );
-    void SetConsoleTextAttribute(Pointer in_hConsoleOutput,
-                                 short in_wAttributes)
-            throws LastErrorException;
-
-    // BOOL WINAPI SetConsoleTitle(
-    // _In_ LPCTSTR lpConsoleTitle
-    // );
-    void SetConsoleTitle(String in_lpConsoleTitle)
-            throws LastErrorException;
-
-//    // BOOL WINAPI SetConsoleWindowInfo(
-//    // _In_ HANDLE hConsoleOutput,
-//    // _In_ BOOL bAbsolute,
-//    // _In_ const SMALL_RECT *lpConsoleWindow);
-//    void SetConsoleWindowInfo(Pointer in_hConsoleOutput,
-//                              boolean in_bAbsolute, SMALL_RECT in_lpConsoleWindow)
-//            throws LastErrorException;
-
-    // BOOL WINAPI WriteConsole(
-    //  _In_             HANDLE  hConsoleOutput,
-    //  _In_       const VOID    *lpBuffer,
-    //  _In_             DWORD   nNumberOfCharsToWrite,
-    //  _Out_            LPDWORD lpNumberOfCharsWritten,
-    //  _Reserved_       LPVOID  lpReserved
-    // );
-    void WriteConsoleW(Pointer in_hConsoleOutput, char[] in_lpBuffer, int in_nNumberOfCharsToWrite,
-                          IntByReference out_lpNumberOfCharsWritten, Pointer reserved_lpReserved) throws LastErrorException;
-
-//    // BOOL WINAPI WriteConsoleOutput(
-//    // _In_ HANDLE hConsoleOutput,
-//    // _In_ const CHAR_INFO *lpBuffer,
-//    // _In_ COORD dwBufferSize,
-//    // _In_ COORD dwBufferCoord,
-//    // _Inout_ PSMALL_RECT lpWriteRegion);
-////    void WriteConsoleOutput(Pointer in_hConsoleOutput, CHAR_INFO[] in_lpBuffer,
-////                            COORD in_dwBufferSize, COORD in_dwBufferCoord,
-////                            SMALL_RECT inout_lpWriteRegion) throws LastErrorException;
-////    void WriteConsoleOutputA(Pointer in_hConsoleOutput, CHAR_INFO[] in_lpBuffer,
-////                             COORD in_dwBufferSize, COORD in_dwBufferCoord,
-////                             SMALL_RECT inout_lpWriteRegion) throws LastErrorException;
-//
-//    // BOOL WINAPI WriteConsoleOutputCharacter(
-//    // _In_ HANDLE hConsoleOutput,
-//    // _In_ LPCTSTR lpCharacter,
-//    // _In_ DWORD nLength,
-//    // _In_ COORD dwWriteCoord,
-//    // _Out_ LPDWORD lpNumberOfCharsWritten);
-//    void WriteConsoleOutputCharacter(Pointer in_hConsoleOutput,
-//                                     char[] in_lpCharacter, int in_nLength, COORD in_dwWriteCoord,
-//                                     IntByReference out_lpNumberOfCharsWritten)
-//            throws LastErrorException;
-//    void WriteConsoleOutputCharacterA(Pointer in_hConsoleOutput,
-//                                      byte[] in_lpCharacter, int in_nLength, COORD in_dwWriteCoord,
-//                                      IntByReference out_lpNumberOfCharsWritten)
-//            throws LastErrorException;
-//
-    // BOOL WINAPI ScrollConsoleScreenBuffer(
-    //     _In_           HANDLE     hConsoleOutput,
-    //     _In_     const SMALL_RECT *lpScrollRectangle,
-    //     _In_opt_ const SMALL_RECT *lpClipRectangle,
-    //     _In_           COORD      dwDestinationOrigin,
-    //     _In_     const CHAR_INFO  *lpFill);
-    void ScrollConsoleScreenBuffer(Pointer in_hConsoleOutput,
-                                   SMALL_RECT in_lpScrollRectangle,
-                                   SMALL_RECT in_lpClipRectangle,
-                                   COORD in_dwDestinationOrigin,
-                                   CHAR_INFO in_lpFill)
-            throws LastErrorException;
-
-    // typedef struct _CHAR_INFO {
-    //   union {
-    //     WCHAR UnicodeChar;
-    //     CHAR  AsciiChar;
-    //   } Char;
-    //   WORD  Attributes;
-    // } CHAR_INFO, *PCHAR_INFO;
-    class CHAR_INFO {//extends Structure {
-        public CHAR_INFO() {
-        }
-
-        public CHAR_INFO(char c, short attr) {
-            uChar = new UnionChar(c);
-            Attributes = attr;
-        }
-
-//        public CHAR_INFO(byte c, short attr) {
-//            uChar = new UnionChar(c);
-//            Attributes = attr;
-//        }
-
-        public UnionChar uChar;
-        public short Attributes;
-
-//        public static CHAR_INFO[] createArray(int size) {
-//            return (CHAR_INFO[]) new CHAR_INFO().toArray(size);
-//        }
-//
-//        private static String[] fieldOrder = { "uChar", "Attributes" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _CONSOLE_CURSOR_INFO {
-    //   DWORD dwSize;
-    //   BOOL  bVisible;
-    // } CONSOLE_CURSOR_INFO, *PCONSOLE_CURSOR_INFO;
-    class CONSOLE_CURSOR_INFO {//extends Structure {
-        public int dwSize;
-        public boolean bVisible;
-
-//        public static class ByReference extends CONSOLE_CURSOR_INFO implements
-//                Structure.ByReference {
-//        }
-//
-//        private static String[] fieldOrder = { "dwSize", "bVisible" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _CONSOLE_SCREEN_BUFFER_INFO {
-    //   COORD      dwSize;
-    //   COORD      dwCursorPosition;
-    //   WORD       wAttributes;
-    //   SMALL_RECT srWindow;
-    //   COORD      dwMaximumWindowSize;
-    // } CONSOLE_SCREEN_BUFFER_INFO;
-    class CONSOLE_SCREEN_BUFFER_INFO {//extends Structure {
-        public COORD      dwSize;
-        public COORD      dwCursorPosition;
-        public short      wAttributes;
-        public SMALL_RECT srWindow;
-        public COORD      dwMaximumWindowSize;
-
-//        private static String[] fieldOrder = { "dwSize", "dwCursorPosition", "wAttributes", "srWindow", "dwMaximumWindowSize" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-
-        public int windowWidth() {
-            return this.srWindow.width() + 1;
-        }
-
-        public int windowHeight() {
-            return this.srWindow.height() + 1;
-        }
-    }
-
-    // typedef struct _COORD {
-    //    SHORT X;
-    //    SHORT Y;
-    //  } COORD, *PCOORD;
-    class COORD {//extends Structure implements Structure.ByValue {
-        public COORD() {
-        }
-
-        public COORD(short X, short Y) {
-            this.X = X;
-            this.Y = Y;
-        }
-
-        public short X;
-        public short Y;
-
-//        private static String[] fieldOrder = { "X", "Y" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _INPUT_RECORD {
-    //   WORD  EventType;
-    //   union {
-    //     KEY_EVENT_RECORD          KeyEvent;
-    //     MOUSE_EVENT_RECORD        MouseEvent;
-    //     WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent;
-    //     MENU_EVENT_RECORD         MenuEvent;
-    //     FOCUS_EVENT_RECORD        FocusEvent;
-    //   } Event;
-    // } INPUT_RECORD;
-    class INPUT_RECORD {//extends Structure {
-        public static final short KEY_EVENT = 0x0001;
-        public static final short MOUSE_EVENT = 0x0002;
-        public static final short WINDOW_BUFFER_SIZE_EVENT = 0x0004;
-        public static final short MENU_EVENT = 0x0008;
-        public static final short FOCUS_EVENT = 0x0010;
-
-        public short EventType;
-        public EventUnion Event;
-
-        public static class EventUnion {//extends Union {
-            public KEY_EVENT_RECORD KeyEvent;
-            public MOUSE_EVENT_RECORD MouseEvent;
-            public WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent;
-            public MENU_EVENT_RECORD MenuEvent;
-            public FOCUS_EVENT_RECORD FocusEvent;
-        }
-
-//        @Override
-//        public void read() {
-//            readField("EventType");
-//            switch (EventType) {
-//                case KEY_EVENT:
-//                    Event.setType(KEY_EVENT_RECORD.class);
-//                    break;
-//                case MOUSE_EVENT:
-//                    Event.setType(MOUSE_EVENT_RECORD.class);
-//                    break;
-//                case WINDOW_BUFFER_SIZE_EVENT:
-//                    Event.setType(WINDOW_BUFFER_SIZE_RECORD.class);
-//                    break;
-//                case MENU_EVENT:
-//                    Event.setType(MENU_EVENT_RECORD.class);
-//                    break;
-//                case FOCUS_EVENT:
-//                    Event.setType(MENU_EVENT_RECORD.class);
-//                    break;
-//            }
-//            super.read();
-//        }
-
-//        private static String[] fieldOrder = {"EventType", "Event"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _KEY_EVENT_RECORD {
-    //   BOOL  bKeyDown;
-    //   WORD  wRepeatCount;
-    //   WORD  wVirtualKeyCode;
-    //   WORD  wVirtualScanCode;
-    //   union {
-    //     WCHAR UnicodeChar;
-    //     CHAR  AsciiChar;
-    //   } uChar;
-    //   DWORD dwControlKeyState;
-    // } KEY_EVENT_RECORD;
-    class KEY_EVENT_RECORD {//extends Structure {
-        public boolean bKeyDown;
-        public short wRepeatCount;
-        public short wVirtualKeyCode;
-        public short wVirtualScanCode;
-        public UnionChar uChar;
-        public int dwControlKeyState;
-
-//        private static String[] fieldOrder = {"bKeyDown", "wRepeatCount", "wVirtualKeyCode", "wVirtualScanCode", "uChar", "dwControlKeyState"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _MOUSE_EVENT_RECORD {
-    //   COORD dwMousePosition;
-    //   DWORD dwButtonState;
-    //   DWORD dwControlKeyState;
-    //   DWORD dwEventFlags;
-    // } MOUSE_EVENT_RECORD;
-    class MOUSE_EVENT_RECORD {//extends Structure {
-        public COORD dwMousePosition;
-        public int dwButtonState;
-        public int dwControlKeyState;
-        public int dwEventFlags;
-
-//        private static String[] fieldOrder = { "dwMousePosition", "dwButtonState", "dwControlKeyState", "dwEventFlags"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _WINDOW_BUFFER_SIZE_RECORD {
-    //   COORD dwSize;
-    // } WINDOW_BUFFER_SIZE_RECORD;
-    class WINDOW_BUFFER_SIZE_RECORD {//extends Structure {
-        public COORD dwSize;
-
-//        private static String[] fieldOrder = {"dwSize"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _MENU_EVENT_RECORD {
-    //   UINT dwCommandId;
-    // } MENU_EVENT_RECORD, *PMENU_EVENT_RECORD;
-    class MENU_EVENT_RECORD {//extends Structure {
-
-        public int dwCommandId;
-
-//        private static String[] fieldOrder = {"dwCommandId"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _FOCUS_EVENT_RECORD {
-    //  BOOL bSetFocus;
-    //} FOCUS_EVENT_RECORD;
-    class FOCUS_EVENT_RECORD {//extends Structure {
-        public boolean bSetFocus;
-
-//        private static String[] fieldOrder = {"bSetFocus"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _SMALL_RECT {
-    //    SHORT Left;
-    //    SHORT Top;
-    //    SHORT Right;
-    //    SHORT Bottom;
-    //  } SMALL_RECT;
-    class SMALL_RECT {//extends Structure {
-        public SMALL_RECT() {
-        }
-
-        public SMALL_RECT(SMALL_RECT org) {
-            this(org.Top, org.Left, org.Bottom, org.Right);
-        }
-
-        public SMALL_RECT(short Top, short Left, short Bottom, short Right) {
-            this.Top = Top;
-            this.Left = Left;
-            this.Bottom = Bottom;
-            this.Right = Right;
-        }
-
-        public short Left;
-        public short Top;
-        public short Right;
-        public short Bottom;
-
-//        private static String[] fieldOrder = { "Left", "Top", "Right", "Bottom" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-
-        public short width() {
-            return (short)(this.Right - this.Left);
-        }
-
-        public short height() {
-            return (short)(this.Bottom - this.Top);
-        }
-
-    }
-
-    class UnionChar {//extends Union {
-        public UnionChar() {
-        }
-
-        public UnionChar(char c) {
-//            setType(char.class);
-            UnicodeChar = c;
-        }
-
-//        public UnionChar(byte c) {
-//            setType(byte.class);
-//            AsciiChar = c;
-//        }
-
-        public void set(char c) {
-//            setType(char.class);
-            UnicodeChar = c;
-        }
-
-//        public void set(byte c) {
-//            setType(byte.class);
-//            AsciiChar = c;
-//        }
-
-        public char UnicodeChar;
-//        public byte AsciiChar;
-    }
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32Impl.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32Impl.java
deleted file mode 100644
index 67f69a6351163..0000000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32Impl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.org.jline.terminal.impl.jna.win;
-
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CHAR_INFO;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_SCREEN_BUFFER_INFO;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.COORD;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.SMALL_RECT;
-
-public class Kernel32Impl implements Kernel32 {
-
-    static {
-        System.loadLibrary("le");
-        initIDs();
-    }
-
-    private static native void initIDs();
-
-    @Override
-    public native int WaitForSingleObject(Pointer in_hHandle, int in_dwMilliseconds);
-
-    @Override
-    public native Pointer GetStdHandle(int nStdHandle);
-
-    @Override
-    public native int GetConsoleOutputCP();
-
-    @Override
-    public native void FillConsoleOutputCharacter(Pointer in_hConsoleOutput, char in_cCharacter, int in_nLength, COORD in_dwWriteCoord, IntByReference out_lpNumberOfCharsWritten) throws LastErrorException;
-
-    @Override
-    public native void FillConsoleOutputAttribute(Pointer in_hConsoleOutput, short in_wAttribute, int in_nLength, COORD in_dwWriteCoord, IntByReference out_lpNumberOfAttrsWritten) throws LastErrorException;
-
-    @Override
-    public native void GetConsoleMode(Pointer in_hConsoleOutput, IntByReference out_lpMode) throws LastErrorException;
-
-    @Override
-    public native void GetConsoleScreenBufferInfo(Pointer in_hConsoleOutput, CONSOLE_SCREEN_BUFFER_INFO out_lpConsoleScreenBufferInfo) throws LastErrorException;
-
-    @Override
-    public native void ReadConsoleInput(Pointer in_hConsoleOutput, INPUT_RECORD[] out_lpBuffer, int in_nLength, IntByReference out_lpNumberOfEventsRead) throws LastErrorException;
-
-    @Override
-    public native void SetConsoleCursorPosition(Pointer in_hConsoleOutput, COORD in_dwCursorPosition) throws LastErrorException;
-
-    @Override
-    public native void SetConsoleMode(Pointer in_hConsoleOutput, int in_dwMode) throws LastErrorException;
-
-    @Override
-    public native void SetConsoleTextAttribute(Pointer in_hConsoleOutput, short in_wAttributes) throws LastErrorException;
-
-    @Override
-    public native void SetConsoleTitle(String in_lpConsoleTitle) throws LastErrorException;
-
-    @Override
-    public native void WriteConsoleW(Pointer in_hConsoleOutput, char[] in_lpBuffer, int in_nNumberOfCharsToWrite, IntByReference out_lpNumberOfCharsWritten, Pointer reserved_lpReserved) throws LastErrorException;
-
-    @Override
-    public native void ScrollConsoleScreenBuffer(Pointer in_hConsoleOutput, SMALL_RECT in_lpScrollRectangle, SMALL_RECT in_lpClipRectangle, COORD in_dwDestinationOrigin, CHAR_INFO in_lpFill) throws LastErrorException;
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Pointer.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Pointer.java
deleted file mode 100644
index aeb7f758e7dc1..0000000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Pointer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.org.jline.terminal.impl.jna.win;
-
-class Pointer {
-    public final long value;
-
-    public Pointer(long value) {
-        this.value = value;
-    }
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java
deleted file mode 100644
index 5ae0df1b201b2..0000000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 2002-2016, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.win;
-
-import java.io.IOException;
-import java.io.Writer;
-
-//import com.sun.jna.Pointer;
-//import com.sun.jna.ptr.IntByReference;
-import jdk.internal.org.jline.utils.AnsiWriter;
-import jdk.internal.org.jline.utils.Colors;
-
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.BACKGROUND_BLUE;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.BACKGROUND_GREEN;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.BACKGROUND_INTENSITY;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.BACKGROUND_RED;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOREGROUND_BLUE;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOREGROUND_GREEN;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOREGROUND_INTENSITY;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOREGROUND_RED;
-
-
-/**
- * A Windows ANSI escape processor, uses JNA to access native platform
- * API's to change the console attributes.
- *
- * @since 1.0
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- * @author Joris Kuipers
- */
-public final class WindowsAnsiWriter extends AnsiWriter {
-
-    private static final short FOREGROUND_BLACK   = 0;
-    private static final short FOREGROUND_YELLOW  = (short) (FOREGROUND_RED|FOREGROUND_GREEN);
-    private static final short FOREGROUND_MAGENTA = (short) (FOREGROUND_BLUE|FOREGROUND_RED);
-    private static final short FOREGROUND_CYAN    = (short) (FOREGROUND_BLUE|FOREGROUND_GREEN);
-    private static final short FOREGROUND_WHITE   = (short) (FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE);
-
-    private static final short BACKGROUND_BLACK   = 0;
-    private static final short BACKGROUND_YELLOW  = (short) (BACKGROUND_RED|BACKGROUND_GREEN);
-    private static final short BACKGROUND_MAGENTA = (short) (BACKGROUND_BLUE|BACKGROUND_RED);
-    private static final short BACKGROUND_CYAN    = (short) (BACKGROUND_BLUE|BACKGROUND_GREEN);
-    private static final short BACKGROUND_WHITE   = (short) (BACKGROUND_RED|BACKGROUND_GREEN|BACKGROUND_BLUE);
-
-    private static final short ANSI_FOREGROUND_COLOR_MAP[] = {
-            FOREGROUND_BLACK,
-            FOREGROUND_RED,
-            FOREGROUND_GREEN,
-            FOREGROUND_YELLOW,
-            FOREGROUND_BLUE,
-            FOREGROUND_MAGENTA,
-            FOREGROUND_CYAN,
-            FOREGROUND_WHITE,
-    };
-
-    private static final short ANSI_BACKGROUND_COLOR_MAP[] = {
-            BACKGROUND_BLACK,
-            BACKGROUND_RED,
-            BACKGROUND_GREEN,
-            BACKGROUND_YELLOW,
-            BACKGROUND_BLUE,
-            BACKGROUND_MAGENTA,
-            BACKGROUND_CYAN,
-            BACKGROUND_WHITE,
-    };
-
-    private static final int MAX_ESCAPE_SEQUENCE_LENGTH = 100;
-
-    private final Pointer console;
-
-    private final Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
-    private final short originalColors;
-
-    private boolean negative;
-    private boolean bold;
-    private boolean underline;
-    private short savedX = -1;
-    private short savedY = -1;
-
-    public WindowsAnsiWriter(Writer out, Pointer console) throws IOException {
-        super(out);
-        this.console = console;
-        getConsoleInfo();
-        originalColors = info.wAttributes;
-    }
-
-    private void getConsoleInfo() throws IOException {
-        out.flush();
-        Kernel32.INSTANCE.GetConsoleScreenBufferInfo(console, info);
-        if (negative) {
-            info.wAttributes = invertAttributeColors(info.wAttributes);
-        }
-    }
-
-    private void applyAttribute() throws IOException {
-        out.flush();
-        short attributes = info.wAttributes;
-        // bold is simulated by high foreground intensity
-        if (bold) {
-            attributes |= FOREGROUND_INTENSITY;
-        }
-        // underline is simulated by high foreground intensity
-        if (underline) {
-            attributes |= BACKGROUND_INTENSITY;
-        }
-        if (negative) {
-            attributes = invertAttributeColors(attributes);
-        }
-        Kernel32.INSTANCE.SetConsoleTextAttribute(console, attributes);
-    }
-
-    private short invertAttributeColors(short attributes) {
-        // Swap the the Foreground and Background bits.
-        int fg = 0x000F & attributes;
-        fg <<= 4;
-        int bg = 0X00F0 & attributes;
-        bg >>= 4;
-        attributes = (short) ((attributes & 0xFF00) | fg | bg);
-        return attributes;
-    }
-
-    private void applyCursorPosition() throws IOException {
-        info.dwCursorPosition.X = (short) Math.max(0, Math.min(info.dwSize.X - 1, info.dwCursorPosition.X));
-        info.dwCursorPosition.Y = (short) Math.max(0, Math.min(info.dwSize.Y - 1, info.dwCursorPosition.Y));
-        Kernel32.INSTANCE.SetConsoleCursorPosition(console, info.dwCursorPosition);
-    }
-
-    protected void processEraseScreen(int eraseOption) throws IOException {
-        getConsoleInfo();
-        IntByReference written = new IntByReference();
-        switch(eraseOption) {
-            case ERASE_SCREEN:
-                Kernel32.COORD topLeft = new Kernel32.COORD();
-                topLeft.X = 0;
-                topLeft.Y = info.srWindow.Top;
-                int screenLength = info.srWindow.height() * info.dwSize.X;
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', screenLength, topLeft, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, screenLength, topLeft, written);
-                break;
-            case ERASE_SCREEN_TO_BEGINING:
-                Kernel32.COORD topLeft2 = new Kernel32.COORD();
-                topLeft2.X = 0;
-                topLeft2.Y = info.srWindow.Top;
-                int lengthToCursor = (info.dwCursorPosition.Y - info.srWindow.Top) * info.dwSize.X + info.dwCursorPosition.X;
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', lengthToCursor, topLeft2, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, lengthToCursor, topLeft2, written);
-                break;
-            case ERASE_SCREEN_TO_END:
-                int lengthToEnd = (info.srWindow.Bottom - info.dwCursorPosition.Y) * info.dwSize.X +
-                        (info.dwSize.X - info.dwCursorPosition.X);
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', lengthToEnd, info.dwCursorPosition, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, lengthToEnd, info.dwCursorPosition, written);
-        }
-    }
-
-    protected void processEraseLine(int eraseOption) throws IOException {
-        getConsoleInfo();
-        IntByReference written = new IntByReference();
-        switch(eraseOption) {
-            case ERASE_LINE:
-                Kernel32.COORD leftColCurrRow = new Kernel32.COORD((short) 0, info.dwCursorPosition.Y);
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', info.dwSize.X, leftColCurrRow, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, info.dwSize.X, leftColCurrRow, written);
-                break;
-            case ERASE_LINE_TO_BEGINING:
-                Kernel32.COORD leftColCurrRow2 = new Kernel32.COORD((short) 0, info.dwCursorPosition.Y);
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', info.dwCursorPosition.X, leftColCurrRow2, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, info.dwCursorPosition.X, leftColCurrRow2, written);
-                break;
-            case ERASE_LINE_TO_END:
-                int lengthToLastCol = info.dwSize.X - info.dwCursorPosition.X;
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', lengthToLastCol, info.dwCursorPosition, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, lengthToLastCol, info.dwCursorPosition, written);
-        }
-    }
-
-    protected void processCursorUpLine(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X = 0;
-        info.dwCursorPosition.Y -= (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorDownLine(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X = 0;
-        info.dwCursorPosition.Y += (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorLeft(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X -= (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorRight(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X += (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorDown(int count) throws IOException {
-        getConsoleInfo();
-        int nb = Math.max(0, info.dwCursorPosition.Y + count - info.dwSize.Y + 1);
-        if (nb != count) {
-            info.dwCursorPosition.Y += (short) count;
-            applyCursorPosition();
-        }
-        if (nb > 0) {
-            Kernel32.SMALL_RECT scroll = new Kernel32.SMALL_RECT(info.srWindow);
-            scroll.Top = 0;
-            Kernel32.COORD org = new Kernel32.COORD();
-            org.X = 0;
-            org.Y = (short)(- nb);
-            Kernel32.CHAR_INFO info = new Kernel32.CHAR_INFO(' ', originalColors);
-            Kernel32.INSTANCE.ScrollConsoleScreenBuffer(console, scroll, scroll, org, info);
-        }
-    }
-
-    protected void processCursorUp(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.Y -= (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorTo(int row, int col) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.Y = (short) (info.srWindow.Top + row - 1);
-        info.dwCursorPosition.X = (short) (col - 1);
-        applyCursorPosition();
-    }
-
-    protected void processCursorToColumn(int x) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X = (short) (x - 1);
-        applyCursorPosition();
-    }
-
-    @Override
-    protected void processSetForegroundColorExt(int paletteIndex) throws IOException {
-        int color = Colors.roundColor(paletteIndex, 16);
-        info.wAttributes = (short) ((info.wAttributes & ~0x0007) | ANSI_FOREGROUND_COLOR_MAP[color & 0x07]);
-        info.wAttributes = (short) ((info.wAttributes & ~FOREGROUND_INTENSITY) | (color >= 8 ? FOREGROUND_INTENSITY : 0));
-        applyAttribute();
-    }
-
-    protected void processSetBackgroundColorExt(int paletteIndex) throws IOException {
-        int color = Colors.roundColor(paletteIndex, 16);
-        info.wAttributes = (short)((info.wAttributes & ~0x0070 ) | ANSI_BACKGROUND_COLOR_MAP[color & 0x07]);
-        info.wAttributes = (short) ((info.wAttributes & ~BACKGROUND_INTENSITY) | (color >= 8 ? BACKGROUND_INTENSITY : 0));
-        applyAttribute();
-    }
-
-    protected void processDefaultTextColor() throws IOException {
-        info.wAttributes = (short)((info.wAttributes & ~0x000F ) | (originalColors & 0x000F));
-        applyAttribute();
-    }
-
-    protected void processDefaultBackgroundColor() throws IOException {
-        info.wAttributes = (short)((info.wAttributes & ~0x00F0 ) | (originalColors & 0x00F0));
-        applyAttribute();
-    }
-
-    protected void processAttributeRest() throws IOException {
-        info.wAttributes = (short)((info.wAttributes & ~0x00FF ) | originalColors);
-        this.negative = false;
-        this.bold = false;
-        this.underline = false;
-        applyAttribute();
-    }
-
-    protected void processSetAttribute(int attribute) throws IOException {
-        switch(attribute) {
-            case ATTRIBUTE_INTENSITY_BOLD:
-                bold = true;
-                applyAttribute();
-                break;
-            case ATTRIBUTE_INTENSITY_NORMAL:
-                bold = false;
-                applyAttribute();
-                break;
-
-            case ATTRIBUTE_UNDERLINE:
-                underline = true;
-                applyAttribute();
-                break;
-            case ATTRIBUTE_UNDERLINE_OFF:
-                underline = false;
-                applyAttribute();
-                break;
-
-            case ATTRIBUTE_NEGATIVE_ON:
-                negative = true;
-                applyAttribute();
-                break;
-            case ATTRIBUTE_NEGATIVE_OFF:
-                negative = false;
-                applyAttribute();
-                break;
-        }
-    }
-
-    protected void processSaveCursorPosition() throws IOException {
-        getConsoleInfo();
-        savedX = info.dwCursorPosition.X;
-        savedY = info.dwCursorPosition.Y;
-    }
-
-    protected void processRestoreCursorPosition() throws IOException {
-        // restore only if there was a save operation first
-        if (savedX != -1 && savedY != -1) {
-            out.flush();
-            info.dwCursorPosition.X = savedX;
-            info.dwCursorPosition.Y = savedY;
-            applyCursorPosition();
-        }
-    }
-
-    @Override
-    protected void processInsertLine(int optionInt) throws IOException {
-        getConsoleInfo();
-        Kernel32.SMALL_RECT scroll = new Kernel32.SMALL_RECT(info.srWindow);
-        scroll.Top = info.dwCursorPosition.Y;
-        Kernel32.COORD org = new Kernel32.COORD();
-        org.X = 0;
-        org.Y = (short)(info.dwCursorPosition.Y + optionInt);
-        Kernel32.CHAR_INFO info = new Kernel32.CHAR_INFO(' ', originalColors);
-        Kernel32.INSTANCE.ScrollConsoleScreenBuffer(console, scroll, scroll, org, info);
-    }
-
-    @Override
-    protected void processDeleteLine(int optionInt) throws IOException {
-        getConsoleInfo();
-        Kernel32.SMALL_RECT scroll = new Kernel32.SMALL_RECT(info.srWindow);
-        scroll.Top = info.dwCursorPosition.Y;
-        Kernel32.COORD org = new Kernel32.COORD();
-        org.X = 0;
-        org.Y = (short)(info.dwCursorPosition.Y - optionInt);
-        Kernel32.CHAR_INFO info = new Kernel32.CHAR_INFO(' ', originalColors);
-        Kernel32.INSTANCE.ScrollConsoleScreenBuffer(console, scroll, scroll, org, info);
-    }
-
-    protected void processChangeWindowTitle(String label) {
-        Kernel32.INSTANCE.SetConsoleTitle(label);
-    }
-}
diff --git a/src/jdk.internal.le/windows/native/lible/Kernel32.cpp b/src/jdk.internal.le/windows/native/lible/Kernel32.cpp
deleted file mode 100644
index 59f4df23fb334..0000000000000
--- a/src/jdk.internal.le/windows/native/lible/Kernel32.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl.h"
-
-#include <stdlib.h>
-#include <wincon.h>
-#include <winuser.h>
-
-static jclass pointerClass;
-static jmethodID pointerConstructor;
-static jfieldID pointerValue;
-
-static jclass intByReferenceClass;
-static jfieldID intByReferenceValue;
-
-static jclass lastErrorExceptionClass;
-static jmethodID lastErrorExceptionConstructor;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CHAR_INFO
-static jclass CHAR_INFO_Class;
-static jmethodID CHAR_INFO_Constructor;
-static jfieldID CHAR_INFO_uChar;
-static jfieldID CHAR_INFO_Attributes;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_CURSOR_INFO
-static jclass CONSOLE_CURSOR_INFO_Class;
-static jmethodID CONSOLE_CURSOR_INFO_Constructor;
-static jfieldID CONSOLE_CURSOR_INFO_dwSize;
-static jfieldID CONSOLE_CURSOR_INFO_bVisible;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_SCREEN_BUFFER_INFO
-static jclass CONSOLE_SCREEN_BUFFER_INFO_Class;
-static jmethodID CONSOLE_SCREEN_BUFFER_INFO_Constructor;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_dwSize;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_dwCursorPosition;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_wAttributes;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_srWindow;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_dwMaximumWindowSize;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.COORD
-static jclass COORD_Class;
-static jmethodID COORD_Constructor;
-static jfieldID COORD_X;
-static jfieldID COORD_Y;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD
-static jclass INPUT_RECORD_Class;
-static jmethodID INPUT_RECORD_Constructor;
-static jfieldID INPUT_RECORD_EventType;
-static jfieldID INPUT_RECORD_Event;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD.EventUnion
-static jclass EventUnion_Class;
-static jmethodID EventUnion_Constructor;
-static jfieldID EventUnion_KeyEvent;
-static jfieldID EventUnion_MouseEvent;
-static jfieldID EventUnion_WindowBufferSizeEvent;
-static jfieldID EventUnion_MenuEvent;
-static jfieldID EventUnion_FocusEvent;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.KEY_EVENT_RECORD
-static jclass KEY_EVENT_RECORD_Class;
-static jmethodID KEY_EVENT_RECORD_Constructor;
-static jfieldID KEY_EVENT_RECORD_bKeyDown;
-static jfieldID KEY_EVENT_RECORD_wRepeatCount;
-static jfieldID KEY_EVENT_RECORD_wVirtualKeyCode;
-static jfieldID KEY_EVENT_RECORD_wVirtualScanCode;
-static jfieldID KEY_EVENT_RECORD_uChar;
-static jfieldID KEY_EVENT_RECORD_dwControlKeyState;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.MOUSE_EVENT_RECORD
-static jclass MOUSE_EVENT_RECORD_Class;
-static jmethodID MOUSE_EVENT_RECORD_Constructor;
-static jfieldID MOUSE_EVENT_RECORD_dwMousePosition;
-static jfieldID MOUSE_EVENT_RECORD_dwButtonState;
-static jfieldID MOUSE_EVENT_RECORD_dwControlKeyState;
-static jfieldID MOUSE_EVENT_RECORD_dwEventFlags;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.WINDOW_BUFFER_SIZE_RECORD
-static jclass WINDOW_BUFFER_SIZE_RECORD_Class;
-static jmethodID WINDOW_BUFFER_SIZE_RECORD_Constructor;
-static jfieldID WINDOW_BUFFER_SIZE_RECORD_dwSize;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.MENU_EVENT_RECORD
-static jclass MENU_EVENT_RECORD_Class;
-static jmethodID MENU_EVENT_RECORD_Constructor;
-static jfieldID MENU_EVENT_RECORD_dwCommandId;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOCUS_EVENT_RECORD
-static jclass FOCUS_EVENT_RECORD_Class;
-static jmethodID FOCUS_EVENT_RECORD_Constructor;
-static jfieldID FOCUS_EVENT_RECORD_bSetFocus;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.SMALL_RECT
-static jclass SMALL_RECT_Class;
-static jmethodID SMALL_RECT_Constructor;
-static jfieldID SMALL_RECT_Left;
-static jfieldID SMALL_RECT_Top;
-static jfieldID SMALL_RECT_Right;
-static jfieldID SMALL_RECT_Bottom;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.UnionChar
-static jclass UnionChar_Class;
-static jmethodID UnionChar_Constructor;
-static jfieldID UnionChar_UnicodeChar;
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_initIDs
-  (JNIEnv *env, jclass) {
-    jclass cls;
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Pointer");
-    CHECK_NULL(cls);
-    pointerClass = (jclass) env->NewGlobalRef(cls);
-    pointerConstructor = env->GetMethodID(cls, "<init>", "(J)V");
-    CHECK_NULL(pointerConstructor);
-    pointerValue  = env->GetFieldID(cls, "value", "J");
-    CHECK_NULL(pointerValue);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/LastErrorException");
-    CHECK_NULL(cls);
-    lastErrorExceptionClass = (jclass) env->NewGlobalRef(cls);
-    lastErrorExceptionConstructor = env->GetMethodID(cls, "<init>", "(J)V");
-    CHECK_NULL(lastErrorExceptionConstructor);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/IntByReference");
-    CHECK_NULL(cls);
-    intByReferenceClass = (jclass) env->NewGlobalRef(cls);
-    intByReferenceValue = env->GetFieldID(cls, "value", "I");
-    CHECK_NULL(intByReferenceValue);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CHAR_INFO
-    CHAR_INFO_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$CHAR_INFO"));
-    CHECK_NULL(CHAR_INFO_Class);
-    CHAR_INFO_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(CHAR_INFO_Constructor);
-    CHAR_INFO_uChar = env->GetFieldID(CHAR_INFO_Class, "uChar", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$UnionChar;");
-    CHECK_NULL(CHAR_INFO_uChar);
-    CHAR_INFO_Attributes = env->GetFieldID(CHAR_INFO_Class, "Attributes", "S");
-    CHECK_NULL(CHAR_INFO_Attributes);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_CURSOR_INFO
-    CONSOLE_CURSOR_INFO_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$CONSOLE_CURSOR_INFO"));
-    CHECK_NULL(CONSOLE_CURSOR_INFO_Class);
-    CONSOLE_CURSOR_INFO_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(CONSOLE_CURSOR_INFO_Constructor);
-    CONSOLE_CURSOR_INFO_dwSize = env->GetFieldID(CONSOLE_CURSOR_INFO_Class, "dwSize", "I");
-    CHECK_NULL(CONSOLE_CURSOR_INFO_dwSize);
-    CONSOLE_CURSOR_INFO_bVisible = env->GetFieldID(CONSOLE_CURSOR_INFO_Class, "bVisible", "Z");
-    CHECK_NULL(CONSOLE_CURSOR_INFO_bVisible);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_SCREEN_BUFFER_INFO
-    CONSOLE_SCREEN_BUFFER_INFO_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$CONSOLE_SCREEN_BUFFER_INFO"));
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_Class);
-    CONSOLE_SCREEN_BUFFER_INFO_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_Constructor);
-    CONSOLE_SCREEN_BUFFER_INFO_dwSize = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "dwSize", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_dwSize);
-    CONSOLE_SCREEN_BUFFER_INFO_dwCursorPosition = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "dwCursorPosition", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_dwCursorPosition);
-    CONSOLE_SCREEN_BUFFER_INFO_wAttributes = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "wAttributes", "S");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_wAttributes);
-    CONSOLE_SCREEN_BUFFER_INFO_srWindow = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "srWindow", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$SMALL_RECT;");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_srWindow);
-    CONSOLE_SCREEN_BUFFER_INFO_dwMaximumWindowSize = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "dwMaximumWindowSize", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_dwMaximumWindowSize);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.COORD
-    COORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD"));
-    CHECK_NULL(COORD_Class);
-    COORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(COORD_Constructor);
-    COORD_X = env->GetFieldID(COORD_Class, "X", "S");
-    CHECK_NULL(COORD_X);
-    COORD_Y = env->GetFieldID(COORD_Class, "Y", "S");
-    CHECK_NULL(COORD_Y);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD
-    INPUT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$INPUT_RECORD"));
-    CHECK_NULL(INPUT_RECORD_Class);
-    INPUT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(INPUT_RECORD_Constructor);
-    INPUT_RECORD_EventType = env->GetFieldID(INPUT_RECORD_Class, "EventType", "S");
-    CHECK_NULL(INPUT_RECORD_EventType);
-    INPUT_RECORD_Event = env->GetFieldID(INPUT_RECORD_Class, "Event", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$INPUT_RECORD$EventUnion;");
-    CHECK_NULL(INPUT_RECORD_Event);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD.EventUnion
-    EventUnion_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$INPUT_RECORD$EventUnion"));
-    CHECK_NULL(EventUnion_Class);
-    EventUnion_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(EventUnion_Constructor);
-    EventUnion_KeyEvent = env->GetFieldID(EventUnion_Class, "KeyEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$KEY_EVENT_RECORD;");
-    CHECK_NULL(EventUnion_KeyEvent);
-    EventUnion_MouseEvent = env->GetFieldID(EventUnion_Class, "MouseEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$MOUSE_EVENT_RECORD;");
-    CHECK_NULL(EventUnion_MouseEvent);
-    EventUnion_WindowBufferSizeEvent = env->GetFieldID(EventUnion_Class, "WindowBufferSizeEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$WINDOW_BUFFER_SIZE_RECORD;");
-    CHECK_NULL(EventUnion_WindowBufferSizeEvent);
-    EventUnion_MenuEvent = env->GetFieldID(EventUnion_Class, "MenuEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$MENU_EVENT_RECORD;");
-    CHECK_NULL(EventUnion_MenuEvent);
-    EventUnion_FocusEvent = env->GetFieldID(EventUnion_Class, "FocusEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$FOCUS_EVENT_RECORD;");
-    CHECK_NULL(EventUnion_FocusEvent);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.KEY_EVENT_RECORD
-    KEY_EVENT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$KEY_EVENT_RECORD"));
-    CHECK_NULL(KEY_EVENT_RECORD_Class);
-    KEY_EVENT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(KEY_EVENT_RECORD_Constructor);
-    KEY_EVENT_RECORD_bKeyDown = env->GetFieldID(KEY_EVENT_RECORD_Class, "bKeyDown", "Z");
-    CHECK_NULL(KEY_EVENT_RECORD_bKeyDown);
-    KEY_EVENT_RECORD_wRepeatCount = env->GetFieldID(KEY_EVENT_RECORD_Class, "wRepeatCount", "S");
-    CHECK_NULL(KEY_EVENT_RECORD_wRepeatCount);
-    KEY_EVENT_RECORD_wVirtualKeyCode = env->GetFieldID(KEY_EVENT_RECORD_Class, "wVirtualKeyCode", "S");
-    CHECK_NULL(KEY_EVENT_RECORD_wVirtualKeyCode);
-    KEY_EVENT_RECORD_wVirtualScanCode = env->GetFieldID(KEY_EVENT_RECORD_Class, "wVirtualScanCode", "S");
-    CHECK_NULL(KEY_EVENT_RECORD_wVirtualScanCode);
-    KEY_EVENT_RECORD_uChar = env->GetFieldID(KEY_EVENT_RECORD_Class, "uChar", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$UnionChar;");
-    CHECK_NULL(KEY_EVENT_RECORD_uChar);
-    KEY_EVENT_RECORD_dwControlKeyState = env->GetFieldID(KEY_EVENT_RECORD_Class, "dwControlKeyState", "I");
-    CHECK_NULL(KEY_EVENT_RECORD_dwControlKeyState);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.MOUSE_EVENT_RECORD
-    MOUSE_EVENT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$MOUSE_EVENT_RECORD"));
-    CHECK_NULL(MOUSE_EVENT_RECORD_Class);
-    MOUSE_EVENT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(MOUSE_EVENT_RECORD_Constructor);
-    MOUSE_EVENT_RECORD_dwMousePosition = env->GetFieldID(MOUSE_EVENT_RECORD_Class, "dwMousePosition", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(MOUSE_EVENT_RECORD_dwMousePosition);
-    MOUSE_EVENT_RECORD_dwButtonState = env->GetFieldID(MOUSE_EVENT_RECORD_Class, "dwButtonState", "I");
-    CHECK_NULL(MOUSE_EVENT_RECORD_dwButtonState);
-    MOUSE_EVENT_RECORD_dwControlKeyState = env->GetFieldID(MOUSE_EVENT_RECORD_Class, "dwControlKeyState", "I");
-    CHECK_NULL(MOUSE_EVENT_RECORD_dwControlKeyState);
-    MOUSE_EVENT_RECORD_dwEventFlags = env->GetFieldID(MOUSE_EVENT_RECORD_Class, "dwEventFlags", "I");
-    CHECK_NULL(MOUSE_EVENT_RECORD_dwEventFlags);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.WINDOW_BUFFER_SIZE_RECORD
-    WINDOW_BUFFER_SIZE_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$WINDOW_BUFFER_SIZE_RECORD"));
-    CHECK_NULL(WINDOW_BUFFER_SIZE_RECORD_Class);
-    WINDOW_BUFFER_SIZE_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(WINDOW_BUFFER_SIZE_RECORD_Constructor);
-    WINDOW_BUFFER_SIZE_RECORD_dwSize = env->GetFieldID(WINDOW_BUFFER_SIZE_RECORD_Class, "dwSize", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(WINDOW_BUFFER_SIZE_RECORD_dwSize);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.MENU_EVENT_RECORD
-    MENU_EVENT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$MENU_EVENT_RECORD"));
-    CHECK_NULL(MENU_EVENT_RECORD_Class);
-    MENU_EVENT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(MENU_EVENT_RECORD_Constructor);
-    MENU_EVENT_RECORD_dwCommandId = env->GetFieldID(MENU_EVENT_RECORD_Class, "dwCommandId", "I");
-    CHECK_NULL(MENU_EVENT_RECORD_dwCommandId);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOCUS_EVENT_RECORD
-    FOCUS_EVENT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$FOCUS_EVENT_RECORD"));
-    CHECK_NULL(FOCUS_EVENT_RECORD_Class);
-    FOCUS_EVENT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(FOCUS_EVENT_RECORD_Constructor);
-    FOCUS_EVENT_RECORD_bSetFocus = env->GetFieldID(FOCUS_EVENT_RECORD_Class, "bSetFocus", "Z");
-    CHECK_NULL(FOCUS_EVENT_RECORD_bSetFocus);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.SMALL_RECT
-    SMALL_RECT_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$SMALL_RECT"));
-    CHECK_NULL(SMALL_RECT_Class);
-    SMALL_RECT_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(SMALL_RECT_Constructor);
-    SMALL_RECT_Left = env->GetFieldID(SMALL_RECT_Class, "Left", "S");
-    CHECK_NULL(SMALL_RECT_Left);
-    SMALL_RECT_Top = env->GetFieldID(SMALL_RECT_Class, "Top", "S");
-    CHECK_NULL(SMALL_RECT_Top);
-    SMALL_RECT_Right = env->GetFieldID(SMALL_RECT_Class, "Right", "S");
-    CHECK_NULL(SMALL_RECT_Right);
-    SMALL_RECT_Bottom = env->GetFieldID(SMALL_RECT_Class, "Bottom", "S");
-    CHECK_NULL(SMALL_RECT_Bottom);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.UnionChar
-    UnionChar_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$UnionChar"));
-    CHECK_NULL(UnionChar_Class);
-    UnionChar_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(UnionChar_Constructor);
-    UnionChar_UnicodeChar = env->GetFieldID(UnionChar_Class, "UnicodeChar", "C");
-    CHECK_NULL(UnionChar_UnicodeChar);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    WaitForSingleObject
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;I)I
- */
-JNIEXPORT jint JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_WaitForSingleObject
-  (JNIEnv *env, jobject kernel, jobject in_hHandle, jint in_dwMilliseconds) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hHandle, pointerValue));
-    return WaitForSingleObject(h, in_dwMilliseconds);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    GetStdHandle
- * Signature: (I)Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;
- */
-JNIEXPORT jobject JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_GetStdHandle
-  (JNIEnv *env, jobject, jint nStdHandle) {
-    return env->NewObject(pointerClass,
-                          pointerConstructor,
-                          nStdHandle);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    GetConsoleOutputCP
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_GetConsoleOutputCP
-  (JNIEnv *, jobject) {
-    return GetConsoleOutputCP();
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    FillConsoleOutputCharacter
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;CILjdk/internal/org/jline/terminal/impl/jna/win/Kernel32/COORD;Ljdk/internal/org/jline/terminal/impl/jna/win/IntByReference;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_FillConsoleOutputCharacter
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jchar in_cCharacter, jint in_nLength, jobject in_dwWriteCoord, jobject out_lpNumberOfCharsWritten) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    DWORD written;
-    COORD coord;
-    coord.X = (SHORT) env->GetLongField(in_dwWriteCoord, COORD_X);
-    coord.Y = (SHORT) env->GetLongField(in_dwWriteCoord, COORD_Y);
-    if (!FillConsoleOutputCharacter(h, (CHAR) in_cCharacter, in_nLength, coord, &written)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    env->SetIntField(out_lpNumberOfCharsWritten, intByReferenceValue, written);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    FillConsoleOutputAttribute
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;SILjdk/internal/org/jline/terminal/impl/jna/win/Kernel32/COORD;Ljdk/internal/org/jline/terminal/impl/jna/win/IntByReference;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_FillConsoleOutputAttribute
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jshort in_wAttribute, jint in_nLength, jobject in_dwWriteCoord, jobject out_lpNumberOfAttrsWritten) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    DWORD written;
-    COORD coord;
-    coord.X = (SHORT) env->GetLongField(in_dwWriteCoord, COORD_X);
-    coord.Y = (SHORT) env->GetLongField(in_dwWriteCoord, COORD_Y);
-    if (!FillConsoleOutputAttribute(h, in_wAttribute, in_nLength, coord, &written)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    env->SetIntField(out_lpNumberOfAttrsWritten, intByReferenceValue, written);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    GetConsoleMode
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;Ljdk/internal/org/jline/terminal/impl/jna/win/IntByReference;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_GetConsoleMode
-  (JNIEnv *env, jobject, jobject in_hConsoleOutput, jobject out_lpMode) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    DWORD mode;
-    if (!GetConsoleMode(h, &mode)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    env->SetIntField(out_lpMode, intByReferenceValue, mode);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    GetConsoleScreenBufferInfo
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/CONSOLE_SCREEN_BUFFER_INFO;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_GetConsoleScreenBufferInfo
-  (JNIEnv *env, jobject, jobject in_hConsoleOutput, jobject/*CONSOLE_SCREEN_BUFFER_INFO*/ out_lpConsoleScreenBufferInfo) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    CONSOLE_SCREEN_BUFFER_INFO buffer;
-    if (!GetConsoleScreenBufferInfo(h, &buffer)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-
-    jobject dwSize = env->NewObject(COORD_Class,
-                                    COORD_Constructor);
-    env->SetIntField(dwSize, COORD_X, buffer.dwSize.X);
-    env->SetIntField(dwSize, COORD_Y, buffer.dwSize.Y);
-    env->SetObjectField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_dwSize, dwSize);
-
-    jobject dwCursorPosition = env->NewObject(COORD_Class,
-                                              COORD_Constructor);
-    env->SetIntField(dwCursorPosition, COORD_X, buffer.dwCursorPosition.X);
-    env->SetIntField(dwCursorPosition, COORD_Y, buffer.dwCursorPosition.Y);
-    env->SetObjectField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_dwCursorPosition, dwCursorPosition);
-
-    env->SetIntField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_wAttributes, buffer.wAttributes);
-
-    jobject srWindow = env->NewObject(SMALL_RECT_Class,
-                                      SMALL_RECT_Constructor);
-    env->SetIntField(srWindow, SMALL_RECT_Left, buffer.srWindow.Left);
-    env->SetIntField(srWindow, SMALL_RECT_Top, buffer.srWindow.Top);
-    env->SetIntField(srWindow, SMALL_RECT_Right, buffer.srWindow.Right);
-    env->SetIntField(srWindow, SMALL_RECT_Bottom, buffer.srWindow.Bottom);
-    env->SetObjectField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_srWindow, srWindow);
-
-    jobject dwMaximumWindowSize = env->NewObject(COORD_Class,
-                                                 COORD_Constructor);
-    env->SetIntField(dwMaximumWindowSize, COORD_X, buffer.dwMaximumWindowSize.X);
-    env->SetIntField(dwMaximumWindowSize, COORD_Y, buffer.dwMaximumWindowSize.Y);
-    env->SetObjectField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_dwMaximumWindowSize, dwMaximumWindowSize);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    ReadConsoleInput
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;[Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/INPUT_RECORD;ILjdk/internal/org/jline/terminal/impl/jna/win/IntByReference;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_ReadConsoleInput
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jobjectArray/*INPUT_RECORD[]*/ out_lpBuffer, jint in_nLength, jobject out_lpNumberOfEventsRead) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    INPUT_RECORD *buffer = new INPUT_RECORD[in_nLength];
-    DWORD numberOfEventsRead;
-    if (!ReadConsoleInputW(h, buffer, in_nLength, &numberOfEventsRead)) {
-        delete[] buffer;
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    for (unsigned int i = 0; i < numberOfEventsRead; i++) {
-        jobject record = env->NewObject(INPUT_RECORD_Class,
-                                        INPUT_RECORD_Constructor);
-        env->SetShortField(record, INPUT_RECORD_EventType, buffer[i].EventType);
-        switch (buffer[i].EventType) {
-            case KEY_EVENT: {
-                jobject keyEvent = env->NewObject(KEY_EVENT_RECORD_Class,
-                                                  KEY_EVENT_RECORD_Constructor);
-                env->SetBooleanField(keyEvent, KEY_EVENT_RECORD_bKeyDown, buffer[i].Event.KeyEvent.bKeyDown);
-                env->SetShortField(keyEvent, KEY_EVENT_RECORD_wRepeatCount, buffer[i].Event.KeyEvent.wRepeatCount);
-                env->SetShortField(keyEvent, KEY_EVENT_RECORD_wVirtualKeyCode, buffer[i].Event.KeyEvent.wVirtualKeyCode);
-                env->SetShortField(keyEvent, KEY_EVENT_RECORD_wVirtualScanCode, buffer[i].Event.KeyEvent.wVirtualScanCode);
-
-                jobject unionChar = env->NewObject(UnionChar_Class,
-                                                   UnionChar_Constructor);
-
-                env->SetIntField(unionChar, UnionChar_UnicodeChar, buffer[i].Event.KeyEvent.uChar.UnicodeChar);
-
-                env->SetObjectField(keyEvent, KEY_EVENT_RECORD_uChar, unionChar);
-
-                env->SetIntField(keyEvent, KEY_EVENT_RECORD_dwControlKeyState, buffer[i].Event.KeyEvent.dwControlKeyState);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_KeyEvent, keyEvent);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-            case MOUSE_EVENT: {
-                jobject mouseEvent = env->NewObject(MOUSE_EVENT_RECORD_Class,
-                                                    MOUSE_EVENT_RECORD_Constructor);
-
-                jobject dwMousePosition = env->NewObject(COORD_Class,
-                                                         COORD_Constructor);
-                env->SetIntField(dwMousePosition, COORD_X, buffer[i].Event.MouseEvent.dwMousePosition.X);
-                env->SetIntField(dwMousePosition, COORD_Y, buffer[i].Event.MouseEvent.dwMousePosition.Y);
-                env->SetObjectField(mouseEvent, MOUSE_EVENT_RECORD_dwMousePosition, dwMousePosition);
-                env->SetIntField(mouseEvent, MOUSE_EVENT_RECORD_dwButtonState, buffer[i].Event.MouseEvent.dwButtonState);
-                env->SetIntField(mouseEvent, MOUSE_EVENT_RECORD_dwControlKeyState, buffer[i].Event.MouseEvent.dwControlKeyState);
-                env->SetIntField(mouseEvent, MOUSE_EVENT_RECORD_dwEventFlags, buffer[i].Event.MouseEvent.dwEventFlags);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_MouseEvent, mouseEvent);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-            case WINDOW_BUFFER_SIZE_EVENT: {
-                jobject windowBufferSize = env->NewObject(WINDOW_BUFFER_SIZE_RECORD_Class,
-                                                          WINDOW_BUFFER_SIZE_RECORD_Constructor);
-
-                jobject dwSize = env->NewObject(COORD_Class,
-                                                COORD_Constructor);
-                env->SetIntField(dwSize, COORD_X, buffer[i].Event.WindowBufferSizeEvent.dwSize.X);
-                env->SetIntField(dwSize, COORD_Y, buffer[i].Event.WindowBufferSizeEvent.dwSize.Y);
-                env->SetObjectField(windowBufferSize, WINDOW_BUFFER_SIZE_RECORD_dwSize, dwSize);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_WindowBufferSizeEvent, windowBufferSize);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-            case MENU_EVENT: {
-                jobject menuEvent = env->NewObject(MENU_EVENT_RECORD_Class,
-                                                          MENU_EVENT_RECORD_Constructor);
-
-                env->SetBooleanField(menuEvent, MENU_EVENT_RECORD_dwCommandId, buffer[i].Event.MenuEvent.dwCommandId);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_MenuEvent, menuEvent);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-            case FOCUS_EVENT: {
-                jobject focusEvent = env->NewObject(FOCUS_EVENT_RECORD_Class,
-                                                    FOCUS_EVENT_RECORD_Constructor);
-
-                env->SetIntField(focusEvent, FOCUS_EVENT_RECORD_bSetFocus, buffer[i].Event.FocusEvent.bSetFocus);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_FocusEvent, focusEvent);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-        }
-        env->SetObjectArrayElement(out_lpBuffer, i, record);
-    }
-    env->SetIntField(out_lpNumberOfEventsRead, intByReferenceValue, numberOfEventsRead);
-    delete[] buffer;
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    SetConsoleCursorPosition
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/COORD;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_SetConsoleCursorPosition
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jobject in_dwCursorPosition) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    COORD coord;
-    coord.X = (SHORT) env->GetLongField(in_dwCursorPosition, COORD_X);
-    coord.Y = (SHORT) env->GetLongField(in_dwCursorPosition, COORD_Y);
-    if (!SetConsoleCursorPosition(h, coord)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return;
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    SetConsoleMode
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;I)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_SetConsoleMode
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jint in_dwMode) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    if (!SetConsoleMode(h, in_dwMode)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    SetConsoleTextAttribute
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;S)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_SetConsoleTextAttribute
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jshort in_wAttributes) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    if (!SetConsoleTextAttribute(h, in_wAttributes)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    SetConsoleTitle
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_SetConsoleTitle
-  (JNIEnv *env, jobject, jstring in_lpConsoleTitle) {
-    const char *chars = env->GetStringUTFChars(in_lpConsoleTitle, NULL);
-    if (!SetConsoleTitle(chars)) {
-        env->ReleaseStringUTFChars(in_lpConsoleTitle, chars);
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    env->ReleaseStringUTFChars(in_lpConsoleTitle, chars);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    WriteConsoleW
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;[CILjdk/internal/org/jline/terminal/impl/jna/win/IntByReference;Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_WriteConsoleW
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jcharArray in_lpBuffer, jint in_nNumberOfCharsToWrite, jobject out_lpNumberOfCharsWritten, jobject) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    jchar *chars = new jchar[in_nNumberOfCharsToWrite];
-    env->GetCharArrayRegion(in_lpBuffer, 0, in_nNumberOfCharsToWrite, chars);
-    DWORD written;
-    if (!WriteConsoleW(h, chars, in_nNumberOfCharsToWrite, &written, NULL)) {
-        delete[] chars;
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-
-    env->SetIntField(out_lpNumberOfCharsWritten, intByReferenceValue, written);
-    delete[] chars;
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    ScrollConsoleScreenBuffer
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/SMALL_RECT;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/SMALL_RECT;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/COORD;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/CHAR_INFO;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_ScrollConsoleScreenBuffer
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jobject in_lpScrollRectangle, jobject in_lpClipRectangle, jobject in_dwDestinationOrigin, jobject in_lpFill) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-
-    SMALL_RECT scrollRectangle;
-    scrollRectangle.Left = (SHORT) env->GetLongField(in_lpScrollRectangle, SMALL_RECT_Left);
-    scrollRectangle.Top = (SHORT) env->GetLongField(in_lpScrollRectangle, SMALL_RECT_Top);
-    scrollRectangle.Right = (SHORT) env->GetLongField(in_lpScrollRectangle, SMALL_RECT_Right);
-    scrollRectangle.Bottom = (SHORT) env->GetLongField(in_lpScrollRectangle, SMALL_RECT_Bottom);
-
-    SMALL_RECT clipRectangle;
-    clipRectangle.Left = (SHORT) env->GetLongField(in_lpClipRectangle, SMALL_RECT_Left);
-    clipRectangle.Top = (SHORT) env->GetLongField(in_lpClipRectangle, SMALL_RECT_Top);
-    clipRectangle.Right = (SHORT) env->GetLongField(in_lpClipRectangle, SMALL_RECT_Right);
-    clipRectangle.Bottom = (SHORT) env->GetLongField(in_lpClipRectangle, SMALL_RECT_Bottom);
-
-    COORD destinationOrigin;
-    destinationOrigin.X = (SHORT) env->GetLongField(in_dwDestinationOrigin, COORD_X);
-    destinationOrigin.Y = (SHORT) env->GetLongField(in_dwDestinationOrigin, COORD_Y);
-
-    CHAR_INFO charInfo;
-    charInfo.Char.UnicodeChar = env->GetCharField(env->GetObjectField(in_lpFill, CHAR_INFO_uChar), UnionChar_UnicodeChar);
-    charInfo.Attributes = env->GetShortField(in_lpFill, CHAR_INFO_Attributes);
-
-    if (!ScrollConsoleScreenBuffer(h, &scrollRectangle, &clipRectangle, destinationOrigin, &charInfo)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-}
diff --git a/src/jdk.javadoc/share/man/javadoc.1 b/src/jdk.javadoc/share/man/javadoc.1
index d42d713765754..8c149ff58f041 100644
--- a/src/jdk.javadoc/share/man/javadoc.1
+++ b/src/jdk.javadoc/share/man/javadoc.1
@@ -108,8 +108,8 @@ declaration, they will be ignored.
 To check for any extra or misplaced documentation comments, compile your
 source code with the \f[V]javac\f[R] option \f[V]-Xlint\f[R], or more
 specifically, \f[V]-Xlint:dangling-doc-comments\f[R].
-Within a source file, you may use suppress any warnings generated by
-these options by using
+Within a source file, you may suppress any warnings generated by these
+options by using
 \f[V]\[at]SuppressWarnings(\[dq]dangling-doc-comments\[dq])\f[R] on a
 suitable enclosing declaration.
 .SS Conformance
@@ -920,6 +920,11 @@ throughout the rest of the document.
 This is useful when your source code contains no deprecated APIs, and
 you want to make the navigation bar cleaner.
 .TP
+\f[V]--no-fonts\f[R]
+Prevents inclusion of font files in the generated documentation.
+This can be useful if the documentation uses a custom stylesheet which
+does not use the default fonts.
+.TP
 \f[V]-nohelp\f[R]
 Omits the \f[B]HELP\f[R] link in the navigation bar at the top of each
 generated page.
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/EventType.java b/src/jdk.jfr/share/classes/jdk/jfr/EventType.java
index 07c82d5bf53fa..d9b4e50fca829 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/EventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -50,7 +50,7 @@
  */
 public final class EventType {
     private static final String UNKNOWN = new String();
-    private static final List<String> UNCATEGORIZED = List.of("Uncategorized");
+    private static final String[] UNCATEGORIZED = { "Uncategorized" };
     private final PlatformEventType platformEventType;
     private Map<String, ValueDescriptor> cache; // create lazy to avoid memory overhead
     private String label = UNKNOWN;
@@ -235,11 +235,8 @@ public List<SettingDescriptor> getSettingDescriptors() {
      * @see Category
      */
     public List<String> getCategoryNames() {
-        Category c = platformEventType.getAnnotation(Category.class);
-        if (c == null) {
-            return UNCATEGORIZED;
-        }
-        return List.of(c.value());
+        String[] categories = platformEventType.getAnnotationValue(Category.class, UNCATEGORIZED);
+        return List.of(categories);
     }
 
     // package private
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/AnnotationConstruct.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/AnnotationConstruct.java
index 8b5b45fb223fb..9a203ff372537 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/AnnotationConstruct.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/AnnotationConstruct.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -72,19 +72,11 @@ public void setAnnotationElements(List<AnnotationElement> elements) {
     }
 
     public String getLabel() {
-        Label label = getAnnotation(Label.class);
-        if (label == null) {
-            return null;
-        }
-        return label.value();
+        return getAnnotationValue(Label.class, null);
     }
 
     public String getDescription() {
-        Description description = getAnnotation(Description.class);
-        if (description == null) {
-            return null;
-        }
-        return description.value();
+        return getAnnotationValue(Description.class, null);
     }
 
     @SuppressWarnings("unchecked")
@@ -100,7 +92,20 @@ public List<AnnotationElement> getUnmodifiableAnnotationElements() {
         return annotationElements;
     }
 
-    private AnnotationElement getAnnotationElement(Class<? extends Annotation> clazz) {
+    /**
+     * Convenience method that returns the annotation value, or a default value
+     * if the type lacks the annotation.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T getAnnotationValue(Class<? extends java.lang.annotation.Annotation> clazz, T defaultValue) {
+        AnnotationElement ae = getAnnotationElement(clazz);
+        if (ae == null) {
+            return defaultValue;
+        }
+        return (T) ae.getValues().get(0);
+    }
+
+    AnnotationElement getAnnotationElement(Class<? extends Annotation> clazz) {
         // if multiple annotation elements with the same name exists, prioritize
         // the one with the same id. Note, id alone is not a guarantee, since it
         // may differ between JVM instances.
@@ -123,8 +128,8 @@ public boolean hasUnsigned() {
         // Must be initialized lazily since some annotation elements
         // are added after construction
         if (unsignedFlag < 0) {
-            Unsigned unsigned = getAnnotation(Unsigned.class);
-            unsignedFlag = (byte) (unsigned == null ? 0 :1);
+            AnnotationElement ae = getAnnotationElement(Unsigned.class);
+            unsignedFlag = (byte) (ae == null ? 0 :1);
         }
         return unsignedFlag == (byte)1 ? true : false;
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index 68aa3eb84781d..2a758aa8addc6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -290,72 +290,48 @@ private SettingControl instantiateSettingControl(Class<? extends SettingControl>
     }
 
     private static Control defineEnabled(PlatformEventType type) {
-        Enabled enabled = type.getAnnotation(Enabled.class);
         // Java events are enabled by default,
         // JVM events are not, maybe they should be? Would lower learning curve
         // there too.
-        String def = type.isJVM() ? "false" : "true";
-        if (enabled != null) {
-            def = Boolean.toString(enabled.value());
-        }
+        Boolean defaultValue = Boolean.valueOf(!type.isJVM());
+        String def = type.getAnnotationValue(Enabled.class, defaultValue).toString();
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_ENABLED, Enabled.NAME, def, Collections.emptyList()));
         return new Control(new EnabledSetting(type, def), def);
     }
 
     private static Control defineThreshold(PlatformEventType type) {
-        Threshold threshold = type.getAnnotation(Threshold.class);
-        String def = "0 ns";
-        if (threshold != null) {
-            def = threshold.value();
-        }
+        String def = type.getAnnotationValue(Threshold.class, "0 ns");
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THRESHOLD, Threshold.NAME, def, Collections.emptyList()));
         return new Control(new ThresholdSetting(type), def);
     }
 
     private static Control defineStackTrace(PlatformEventType type) {
-        StackTrace stackTrace = type.getAnnotation(StackTrace.class);
-        String def = "true";
-        if (stackTrace != null) {
-            def = Boolean.toString(stackTrace.value());
-        }
+        String def = type.getAnnotationValue(StackTrace.class, Boolean.TRUE).toString();
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_STACK_TRACE, StackTrace.NAME, def, Collections.emptyList()));
         return new Control(new StackTraceSetting(type, def), def);
     }
 
     private static Control defineCutoff(PlatformEventType type) {
-        Cutoff cutoff = type.getAnnotation(Cutoff.class);
-        String def = Cutoff.INFINITY;
-        if (cutoff != null) {
-            def = cutoff.value();
-        }
+        String def = type.getAnnotationValue(Cutoff.class, Cutoff.INFINITY);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_CUTOFF, Cutoff.NAME, def, Collections.emptyList()));
         return new Control(new CutoffSetting(type), def);
     }
 
     private static Control defineThrottle(PlatformEventType type) {
-        Throttle throttle = type.getAnnotation(Throttle.class);
-        String def = Throttle.DEFAULT;
-        if (throttle != null) {
-            def = throttle.value();
-        }
+        String def = type.getAnnotationValue(Throttle.class, Throttle.DEFAULT);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THROTTLE, Throttle.NAME, def, Collections.emptyList()));
         return new Control(new ThrottleSetting(type), def);
     }
 
     private static Control defineLevel(PlatformEventType type) {
-        Level level = type.getAnnotation(Level.class);
-        String[] values = level.value();
-        String def = values[0];
+        String[] levels = type.getAnnotationValue(Level.class, new String[0]);
+        String def = levels[0]; // Level value always exists
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_LEVEL, Level.NAME, def, Collections.emptyList()));
-        return new Control(new LevelSetting(type, values), def);
+        return new Control(new LevelSetting(type, levels), def);
     }
 
     private static Control definePeriod(PlatformEventType type) {
-        Period period = type.getAnnotation(Period.class);
-        String def = "everyChunk";
-        if (period != null) {
-            def = period.value();
-        }
+        String def = type.getAnnotationValue(Period.class, "everyChunk");
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_PERIOD, PeriodSetting.NAME, def, Collections.emptyList()));
         return new Control(new PeriodSetting(type), def);
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 7d61d3c984fe2..9a2bbfe4c6314 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -73,10 +73,10 @@ private void initializeJVMEventTypes() {
         for (Type type : TypeLibrary.getTypes()) {
             if (type instanceof PlatformEventType pEventType) {
                 EventType eventType = PrivateAccess.getInstance().newEventType(pEventType);
-                pEventType.setHasCutoff(eventType.getAnnotation(Cutoff.class) != null);
-                pEventType.setHasThrottle(eventType.getAnnotation(Throttle.class) != null);
-                pEventType.setHasLevel(eventType.getAnnotation(Level.class) != null);
-                pEventType.setHasPeriod(eventType.getAnnotation(Period.class) != null);
+                pEventType.setHasCutoff(type.hasAnnotation(Cutoff.class));
+                pEventType.setHasThrottle(type.hasAnnotation(Throttle.class));
+                pEventType.setHasLevel(type.hasAnnotation(Level.class));
+                pEventType.setHasPeriod(type.hasAnnotation(Period.class));
                 // Must add hook before EventControl is created as it removes
                 // annotations, such as Period and Threshold.
                 if (pEventType.hasPeriod()) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
index 68888967899b5..1a577c4d775c1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -287,10 +287,11 @@ public T run() {
 
     public static List<SafePath> getPredefinedJFCFiles() {
         List<SafePath> list = new ArrayList<>();
-        try (var ds = doPrivilegedIOWithReturn(() -> Files.newDirectoryStream(JFC_DIRECTORY.toPath(), "*.jfc"))) {
+        try (var ds = doPrivilegedIOWithReturn(() -> Files.newDirectoryStream(JFC_DIRECTORY.toPath()))) {
             for (Path path : ds) {
                 SafePath s = new SafePath(path);
-                if (!SecuritySupport.isDirectory(s)) {
+                String text = s.toString();
+                if (text.endsWith(".jfc") && !SecuritySupport.isDirectory(s)) {
                     list.add(s);
                 }
             }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java
index bc949b8c7ff9d..0306541b4f781 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java
@@ -264,6 +264,10 @@ public List<AnnotationElement> getAnnotationElements() {
         return annos.getUnmodifiableAnnotationElements();
     }
 
+    public <T> T getAnnotationValue(Class<? extends java.lang.annotation.Annotation> clazz, T defaultValue) {
+       return annos.getAnnotationValue(clazz, defaultValue);
+    }
+
     public <T> T getAnnotation(Class<? extends java.lang.annotation.Annotation> clazz) {
         return annos.getAnnotation(clazz);
     }
@@ -359,4 +363,8 @@ public void setInternal(boolean internal) {
     public boolean isInternal() {
         return internal;
     }
+
+    public boolean hasAnnotation(Class<? extends java.lang.annotation.Annotation> clazz) {
+        return annos.getAnnotationElement(clazz) != null;
+    }
 }
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
index fde9b6cadb719..06effa3083cff 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
@@ -1007,7 +1007,7 @@ private synchronized String doReadUserLine(String prompt, Character mask) throws
             input.setState(State.WAIT);
             Display.DISABLE_CR = true;
             in.setHistory(userInputHistory);
-            return in.readLine(prompt, mask);
+            return in.readLine(prompt.replace("%", "%%"), mask);
         } catch (UserInterruptException ex) {
             throw new InterruptedIOException();
         } finally {
diff --git a/src/jdk.random/share/classes/module-info.java b/src/jdk.random/share/classes/module-info.java
deleted file mode 100644
index 3d82090f31334..0000000000000
--- a/src/jdk.random/share/classes/module-info.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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 jdk.internal.util.random.RandomSupport;
-
-/**
- * Defines implementations of the
- * {@linkplain java.util.random.RandomGenerator RandomGenerator Interface}.
- *
- * @provides jdk.random.L128X1024MixRandom
- * @provides jdk.random.L128X128MixRandom
- * @provides jdk.random.L128X256MixRandom
- * @provides jdk.random.L32X64MixRandom
- * @provides jdk.random.L64X1024MixRandom
- * @provides jdk.random.L64X128MixRandom
- * @provides jdk.random.L64X128StarStarRandom
- * @provides jdk.random.L64X256MixRandom
- * @provides jdk.random.Xoroshiro128PlusPlus
- * @provides jdk.random.Xoshiro256PlusPlus
- *
- * @uses java.util.random.RandomGenerator
- *
- * @moduleGraph
- * @since 16
- */
-module jdk.random {
-    exports jdk.random to
-            java.base;
-
-    provides java.util.random.RandomGenerator with
-        jdk.random.L32X64MixRandom,
-        jdk.random.L64X128MixRandom,
-        jdk.random.L64X128StarStarRandom,
-        jdk.random.L64X256MixRandom,
-        jdk.random.L64X1024MixRandom,
-        jdk.random.L128X128MixRandom,
-        jdk.random.L128X256MixRandom,
-        jdk.random.L128X1024MixRandom,
-        jdk.random.Xoroshiro128PlusPlus,
-        jdk.random.Xoshiro256PlusPlus;
-}
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
index c66c40810c086..9508a5dfbca52 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
@@ -41,16 +41,17 @@
 import java.awt.Dimension;
 import java.io.*;
 import java.nio.channels.FileChannel;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
+import java.nio.file.*;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import java.util.zip.ZipInputStream;
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.ErrorManager;
@@ -66,6 +67,9 @@
 import org.openide.windows.Mode;
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+
 
 /**
  *
@@ -76,17 +80,7 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
     public static final String PREFERRED_ID = "OutlineTopComponent";
     private static final GraphDocument document = new GraphDocument();
     private static final int WORK_UNITS = 10000;
-    private static final FileFilter xmlFileFilter = new FileFilter() {
-        @Override
-        public boolean accept(File f) {
-            return f.getName().toLowerCase().endsWith(".xml") || f.isDirectory();
-        }
-
-        @Override
-        public String getDescription() {
-            return "Graph files (*.xml)";
-        }
-    };
+    private static final FileFilter graphFileFilter = new FileNameExtensionFilter("Graph files (*.xml, *.igv)", "xml", "igv");
     private static final Server server = new Server(document, OutlineTopComponent::loadContext);
     public static OutlineTopComponent instance;
     private final Set<FolderNode> selectedFolders = new HashSet<>();
@@ -161,8 +155,26 @@ private static void saveGraphDocument(GraphDocument doc, String path) throws IOE
             }
         }
 
-        try (Writer writer = new OutputStreamWriter(new FileOutputStream(path))) {
-            Printer.exportGraphDocument(writer, doc, saveContexts);
+        if (path.endsWith(".igv")) {
+            File zipFile = new File(path);
+            String fileName = zipFile.getName();
+            try (FileOutputStream fos = new FileOutputStream(zipFile);
+                 ZipOutputStream zos = new ZipOutputStream(fos);
+                 Writer writer = new OutputStreamWriter(zos)) {
+
+                // Replace the '.igv' extension with '.xml's
+                String zipEntryName = fileName.substring(0, fileName.length() - 4) + ".xml";
+                ZipEntry zipEntry = new ZipEntry(zipEntryName);
+                zos.putNextEntry(zipEntry);
+
+                Printer.exportGraphDocument(writer, doc, saveContexts);
+
+                zos.closeEntry();
+            }
+        } else {
+            try (Writer writer = new OutputStreamWriter(new FileOutputStream(path))) {
+                Printer.exportGraphDocument(writer, doc, saveContexts);
+            }
         }
     }
 
@@ -358,7 +370,7 @@ public void clearWorkspace() {
      **/
     public void openFile() {
         JFileChooser fc = new JFileChooser(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT));
-        fc.setFileFilter(xmlFileFilter);
+        fc.setFileFilter(graphFileFilter);
         if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
             clearWorkspace();
             String path = fc.getSelectedFile().getAbsolutePath();
@@ -403,9 +415,22 @@ public void save() {
     }
 
     public void saveAs() {
-        JFileChooser fc = new JFileChooser();
+        JFileChooser fc = new JFileChooser() {
+            @Override
+            public void approveSelection() {
+                File selectedFile = getSelectedFile();
+                if (selectedFile != null) {
+                    String fileName = selectedFile.getName().toLowerCase();
+                    if (!fileName.endsWith(".xml") && !fileName.endsWith(".igv")) {
+                        JOptionPane.showMessageDialog(this, "Please select a graph file with .xml or .igv extension.", "Invalid File", JOptionPane.ERROR_MESSAGE);
+                        return;
+                    }
+                }
+                super.approveSelection();
+            }
+        };
         fc.setDialogTitle("Save As...");
-        fc.setFileFilter(xmlFileFilter);
+        fc.setFileFilter(graphFileFilter);
         fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
         if (fc.showSaveDialog(null) == JFileChooser.APPROVE_OPTION) {
             String path = fc.getSelectedFile().getAbsolutePath();
@@ -432,7 +457,7 @@ public void saveAs() {
      **/
     public void importFromXML() {
         JFileChooser fc = new JFileChooser();
-        fc.setFileFilter(xmlFileFilter);
+        fc.setFileFilter(graphFileFilter);
         fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
         fc.setMultiSelectionEnabled(true);
         if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
@@ -482,60 +507,83 @@ private static void loadContext(GraphContext context) {
     }
 
     /**
-     * Loads a graph document from the given file path, updating progress via a ProgressHandle.
-     * Parse the XML file, add the parsed document to the workspace, and load associated contexts if specified.
+     * Loads a graph document from the specified path, either as an XML file or from a ZIP archive.
+     * If loading the context is requested, it loads the context along with the document.
      */
     private void loadGraphDocument(String path, boolean loadContext) throws IOException {
         if (Files.notExists(Path.of(path))) {
             return;
         }
         File file = new File(path);
-        final FileChannel channel;
-        final long start;
-        try {
-            channel = FileChannel.open(file.toPath(), StandardOpenOption.READ);
-            start = channel.size();
-        } catch (Exception ex) {
-            Exceptions.printStackTrace(ex);
-            return;
+        if (file.getName().endsWith(".xml")) {
+            try (FileChannel channel = FileChannel.open(file.toPath(), StandardOpenOption.READ)) {
+                loadFile(channel, file, loadContext);
+            }
+        } else if (file.getName().endsWith(".igv")) {
+            try (ZipInputStream zis = new ZipInputStream(new FileInputStream(file))) {
+                ZipEntry entry = zis.getNextEntry();
+                if (entry != null && entry.getName().endsWith(".xml")) {
+                    loadFile(Channels.newChannel(zis), file, loadContext);
+                }
+            }
         }
+    }
 
+    /**
+     * Loads an XML or ZIP document from the provided channel, while monitoring the progress of the operation.
+     */
+    private void loadFile(ReadableByteChannel channel,  File file, boolean loadContext) throws IOException {
         final ProgressHandle handle = ProgressHandleFactory.createHandle("Opening file " + file.getName());
         handle.start(WORK_UNITS);
 
-        ParseMonitor monitor = new ParseMonitor() {
-            @Override
-            public void updateProgress() {
-                try {
-                    int prog = (int) (WORK_UNITS * (double) channel.position() / (double) start);
-                    handle.progress(prog);
-                } catch (IOException ignored) {
+        ParseMonitor monitor;
+        if (channel instanceof FileChannel fileChannel) {
+            final long start = fileChannel.size();
+            monitor = new ParseMonitor() {
+                @Override
+                public void updateProgress() {
+                    try {
+                        int prog = (int) (WORK_UNITS * (double) fileChannel.position() / (double) start);
+                        handle.progress(prog);
+                    } catch (IOException ignored) {}
                 }
-            }
 
-            @Override
-            public void setState(String state) {
-                updateProgress();
-                handle.progress(state);
-            }
-        };
+                @Override
+                public void setState(String state) {
+                    updateProgress();
+                    handle.progress(state);
+                }
+            };
+        } else {
+            monitor = new ParseMonitor() {
+                @Override
+                public void updateProgress() {
+                    handle.progress("Processing...");
+                }
+
+                @Override
+                public void setState(String state) {
+                    updateProgress();
+                    handle.progress(state);
+                }
+            };
+        }
+
         try {
-            if (file.getName().endsWith(".xml")) {
-                ArrayList<GraphContext> contexts = new ArrayList<>();
-                final Parser parser = new Parser(channel, monitor, document, loadContext ? contexts::add : null);
-                parser.parse();
-                SwingUtilities.invokeLater(() -> {
-                    for (Node child : manager.getRootContext().getChildren().getNodes(true)) {
-                        // Nodes are lazily created. By expanding and collapsing they are all initialized
-                        ((BeanTreeView) this.treeView).expandNode(child);
-                        ((BeanTreeView) this.treeView).collapseNode(child);
-                    }
-                    requestActive();
-                });
+            ArrayList<GraphContext> contexts = new ArrayList<>();
+            final Parser parser = new Parser(channel, monitor, document, loadContext ? contexts::add : null);
+            parser.parse();
+            SwingUtilities.invokeLater(() -> {
+                for (Node child : manager.getRootContext().getChildren().getNodes(true)) {
+                    // Nodes are lazily created. By expanding and collapsing they are all initialized
+                    ((BeanTreeView) this.treeView).expandNode(child);
+                    ((BeanTreeView) this.treeView).collapseNode(child);
+                }
+                requestActive();
                 for (GraphContext ctx : contexts) {
                     loadContext(ctx);
                 }
-            }
+            });
         } catch (IOException ex) {
             Exceptions.printStackTrace(ex);
         }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java
index 75b8b17ed5a46..f2e1ad16ea691 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -23,6 +23,8 @@
  */
 package com.sun.hotspot.igv.data;
 
+import java.util.Objects;
+
 /**
  *
  * @author Thomas Wuerthinger
@@ -49,17 +51,21 @@ public int getId() {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof InputNode)) {
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        InputNode n = (InputNode) o;
-        return n.id == id;
+        InputNode other = (InputNode) obj;
+        return id == other.id &&
+                Objects.equals(getProperties(), other.getProperties());
     }
 
     @Override
     public int hashCode() {
-        return id * 13;
+        return Objects.hash(id, getProperties());
     }
 
     @Override
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
index f930e47877635..b098b6ef5da9e 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
@@ -103,10 +103,15 @@ private static void exportInputGraph(XMLWriter writer, InputGraph graph, InputGr
             for (InputNode n : removed) {
                 writer.simpleTag(Parser.REMOVE_NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, Integer.toString(n.getId())));
             }
-        }
-
-        for (InputNode n : graph.getNodes()) {
-            if (!difference || !equal.contains(n)) {
+            for (InputNode n : graph.getNodes()) {
+                if (!equal.contains(n)) {
+                    writer.startTag(Parser.NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, Integer.toString(n.getId())));
+                    writer.writeProperties(n.getProperties());
+                    writer.endTag(); // Parser.NODE_ELEMENT
+                }
+            }
+        } else {
+            for (InputNode n : graph.getNodes()) {
                 writer.startTag(Parser.NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, Integer.toString(n.getId())));
                 writer.writeProperties(n.getProperties());
                 writer.endTag(); // Parser.NODE_ELEMENT
@@ -227,6 +232,10 @@ private static void exportInputMethod(XMLWriter w, InputMethod method) throws IO
             b.append(code.getBci());
             b.append(" ");
             b.append(code.getName());
+            b.append(" ");
+            b.append(code.getOperands());
+            b.append(" ");
+            b.append(code.getComment());
             b.append("\n");
         }
 
diff --git a/test/hotspot/gtest/utilities/test_istream.cpp b/test/hotspot/gtest/utilities/test_istream.cpp
new file mode 100644
index 0000000000000..8dd3c6b00b4f8
--- /dev/null
+++ b/test/hotspot/gtest/utilities/test_istream.cpp
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "jvm.h"
+#include "memory/allocation.inline.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/os.hpp"
+#include "utilities/istream.hpp"
+#include "unittest.hpp"
+
+template<typename BlockClass>
+class BlockInputStream : public inputStream {
+  BlockClass _input;
+ public:
+  template<typename... Arg>
+  BlockInputStream(Arg... arg)
+    : _input(arg...) {
+    set_input(&_input);
+  }
+};
+
+#define EXPECT_MEMEQ(s1, s2, len) \
+  EXPECT_PRED_FORMAT3(CmpHelperMEMEQ, s1, s2, len)
+// cf. ::testing::internal::CmpHelperSTREQ
+
+testing::AssertionResult CmpHelperMEMEQ(const char* s1_expression,
+                                        const char* s2_expression,
+                                        const char* len_expression,
+                                        const char* s1, const char* s2,
+                                        size_t len) {
+  if (s1 == nullptr || s2 == nullptr) {
+    return testing::internal::CmpHelperEQ(s1_expression, s2_expression,
+                                          s1, s2);
+  }
+  int c = ::memcmp(s1, s2, len);
+  if (c == 0) {
+    return testing::AssertionSuccess();
+  }
+  ::std::string str1, str2;
+  for (auto which = 0; which <= 1; which++) {
+    auto  s   = which ? s1   : s2;
+    auto &str = which ? str1 : str2;
+    std::stringstream buf;
+    buf << "{";
+    for (size_t i = 0; i < len; i++) {
+      char c = s[i];
+      switch (c) {
+      case '\0':  buf << "\\0"; break;
+      case '\n':  buf << "\\n"; break;
+      case '\\':  buf << "\\\\"; break;
+      default:    buf << c; break;
+      }
+    }
+    buf << "}[" << len_expression << "=" << len << "]";
+    str = buf.str();
+  }
+  return testing::internal::CmpHelperSTREQ(s1_expression, s2_expression,
+                                           str1.c_str(), str2.c_str());
+}
+
+static int firstdiff(char* b1, char* b2, int blen) {
+  for (int i = 0; i < blen; i++) {
+    if (b1[i] != b2[i])  return i;
+  }
+  return -1;
+}
+
+static char* get_temp_file(bool VERBOSE, const char* filename) {
+  const char* tmp_dir = os::get_temp_directory();
+  const char* file_sep = os::file_separator();
+  size_t temp_file_len = strlen(tmp_dir) + strlen(file_sep) + strlen(filename) + 28;
+  char* temp_file = NEW_C_HEAP_ARRAY(char, temp_file_len, mtInternal);
+  int ret = jio_snprintf(temp_file, temp_file_len, "%s%spid%d.%s",
+                         tmp_dir, file_sep,
+                         os::current_process_id(), filename);
+  if (VERBOSE)  tty->print_cr("temp_file = %s", temp_file);
+  return temp_file;
+}
+
+static const char* get_temp_file(bool VERBOSE) {
+  static const char* temp_file = get_temp_file(VERBOSE, "test_istream");
+  return temp_file;
+}
+
+#define EIGHTY 80
+#define LC0(x)     ('/' + (((unsigned)(x)+1) % EIGHTY))
+#define LC(line,col)  LC0((col) * (line))
+
+#define COLS 30
+
+static int cases, total, zeroes;
+#ifdef ASSERT
+#define istream_coverage_mode(mode, a,b,c) \
+  inputStream::coverage_mode(mode, a,b,c)
+#else
+#define istream_coverage_mode(mode, a,b,c)
+#endif
+
+// Fill in a test pattern of ascii characters.
+// Each line is ncols long, plus a line termination of lelen (1 or 2).
+// Each character is a fixed, static function of the line and column.
+// This enables test logic to predict exactly what will be read in each line.
+static void fill_pattern(bool VERBOSE,
+                         char* pat, int patlen, int ncols, int lelen,
+                         int& full_lines, int& partial_line,
+                         const char* &line_end,
+                         const char* &partial_line_end) {
+  full_lines = partial_line = 0;
+  for (int i = 0; i < patlen; i++) {
+    int line = (i / (ncols+lelen)) + 1;  // 1-based line number
+    int col  = (i % (ncols+lelen)) + 1;  // 1-based column number
+    if (col <= ncols) {
+      pat[i] = LC(line, col);
+      partial_line = 1;
+    } else if (col < ncols+lelen) {
+      pat[i] = i == patlen - 1 ? '!' : '%';
+      partial_line = 1;
+    } else {
+      assert(col == ncols+lelen, "");
+      pat[i] = '!';
+      full_lines++;
+      partial_line = 0;
+    }
+  }
+  pat[patlen] = '\0';
+  if (VERBOSE)  tty->print_cr("PATTERN=%d+%d[%s]",
+                              full_lines, partial_line, pat);
+  for (int i = 0; i < patlen; i++) {
+    assert(pat[i] != '%' || (i+1 < patlen && pat[i+1] == '!'), "");
+    if (pat[i] == '!')  pat[i] = '\n';
+    if (pat[i] == '%')  pat[i] = '\r';
+  }
+  assert(pat[patlen-1] != '\r', "");
+
+  line_end = (lelen == 2 ? "\r\n" : "\n");
+  int partial_line_bytes = patlen - (full_lines * (ncols + lelen));
+  assert(partial_line_bytes < ncols + lelen, "");
+  partial_line_end = (partial_line_bytes == ncols + 1) ? "\n" : "";
+}
+
+static const int MAX_PATLEN = COLS * (COLS-1);
+
+static void istream_test_driver(const bool VERBOSE,
+                                const int patlen,
+                                const int ncols,
+                                const int lelen,
+                                const bool TEST_SET_POSITION,
+                                const bool TEST_PUSH_BACK,
+                                const bool TEST_EXPAND_REDUCE) {
+  DEBUG_ONLY( istream_coverage_mode(VERBOSE ? 2 : 1, cases, total, zeroes) );
+  const char* temp_file = get_temp_file(VERBOSE);
+  unlink(temp_file);
+  char pat[MAX_PATLEN+1];
+  int full_lines = 0, partial_line = 0;
+  const char* line_end = "\n";
+  const char* partial_line_end = "";
+  fill_pattern(VERBOSE, pat, patlen, ncols, lelen,
+               full_lines, partial_line,
+               line_end, partial_line_end);
+
+  char pat2[sizeof(pat)];  // copy of pat to help detect scribbling
+  memcpy(pat2, pat, sizeof(pat));
+  // Make three kinds of stream and test them all.
+  MemoryInput _min(pat2, patlen);
+  inputStream sin(&_min);
+  if (VERBOSE) {
+    tty->print("at %llx ", (unsigned long long)(intptr_t)&sin);
+    sin.dump("sin");
+  }
+  {
+    fileStream tfs(temp_file);
+    guarantee(tfs.is_open(), "cannot open temp file");
+    tfs.write(pat, patlen);
+  }
+  BlockInputStream<FileInput> fin(temp_file);
+  if (VERBOSE) {
+    tty->print("at %llx ", (unsigned long long)(intptr_t)&fin);
+    fin.dump("fin");
+  }
+  BlockInputStream<MemoryInput> min(&pat2[0], patlen);
+  if (VERBOSE) {
+    tty->print("at %llx ", (unsigned long long)(intptr_t)&min);
+    sin.dump("min");
+  }
+  inputStream* ins[] = { &sin, &fin, &min };
+  const char* in_names[] = { "sin", "fin", "min" };
+  const char* test_mode = (TEST_SET_POSITION
+                           ? (!TEST_PUSH_BACK ? "(seek)" : "(seek/push)")
+                           : TEST_EXPAND_REDUCE
+                           ? (!TEST_PUSH_BACK ? "(exp/red)" : "(exp/red/push)")
+                           : (!TEST_PUSH_BACK ? "(plain)" : "(push)"));
+  for (int which = 0; which < 3; which++) {
+    inputStream& in = *ins[which];
+    const char* in_name = in_names[which];
+    int lineno;
+    char* lp = (char*)"--";
+#define LPEQ                                                    \
+    in_name << test_mode                                        \
+            << " ncols=" << ncols << " lelen=" << lelen         \
+            << " full=" << full_lines << " lineno=" << lineno   \
+            << " [" << lp << "]" << (in.dump("expect"), "")
+    if (VERBOSE)
+      tty->print_cr("testing %s%s patlen=%d ncols=%d full_lines=%d partial_line=%d",
+                    in_name, test_mode,
+                    patlen, ncols, full_lines, partial_line);
+    int pos_to_set = 0, line_to_set = 1;  // for TEST_SET_POSITION only
+    for (int phase = 0; phase <= (TEST_SET_POSITION ? 1 : 0); phase++) {
+      lineno = 1;
+      for (; lineno <= full_lines + partial_line; lineno++) {
+        EXPECT_EQ(-1, firstdiff(pat, pat2, patlen + 1));
+        if (VERBOSE)  in.dump("!done?");
+        bool done = in.done();
+        EXPECT_TRUE(!done)  <<LPEQ;
+        if (done)  break;
+        lp = in.current_line();
+        const char* expect_endl =
+          (lineno <= full_lines) ? line_end : partial_line_end;
+
+        bool verify_lp = true;
+        if (verify_lp) {
+          int actual_lineno = (int) in.lineno();
+          if (VERBOSE)  in.dump("CL    ");
+          EXPECT_EQ(actual_lineno, lineno)  <<LPEQ;
+          int len = (int) in.current_line_length();
+          EXPECT_EQ(len, (int) strlen(lp))  <<LPEQ;
+          int expect_len = ncols;
+          if (lineno > full_lines)
+            expect_len = MIN2(ncols, patlen % (ncols+lelen));
+          EXPECT_EQ(len, expect_len)  <<LPEQ;
+          for (int j = 0; j < len; j++) {
+            int lc = LC(lineno, j+1);   // 1-based column
+            EXPECT_EQ(lc, lp[j])  <<LPEQ;
+          }
+          if (len != expect_len || len != (int)strlen(lp)) {
+            return;  // no error cascades please
+          }
+        }
+        if (VERBOSE)  in.dump("next  ");
+        in.next();
+      }
+
+      for (int done_test = 0; done_test <= 3; done_test++) {
+        if (done_test == 2)  in.set_done();
+        lp = in.current_line();  // should be empty line
+        if (VERBOSE)  in.dump("done!!");
+        EXPECT_TRUE(lp != nullptr);
+        EXPECT_TRUE(in.done())  <<LPEQ;
+        if (!in.done())  break;
+        EXPECT_EQ((int)in.current_line_length(), 0)   <<LPEQ;
+        EXPECT_EQ(strlen(lp), in.current_line_length())  <<LPEQ;
+        bool extra_next = in.next();
+        EXPECT_TRUE(!extra_next)  <<LPEQ;
+      }
+
+      // no memory side effects
+      EXPECT_EQ(-1, firstdiff(pat, pat2, patlen + 1));
+    }
+  }
+  unlink(temp_file);
+}
+
+static void istream_test_driver(const bool VERBOSE,
+                                const bool TEST_SET_POSITION,
+                                const bool TEST_PUSH_BACK,
+                                const bool TEST_EXPAND_REDUCE) {
+  ResourceMark rm;
+  int patlen = MAX_PATLEN;
+  const bool SHORT_TEST = false;
+  const int SHORT_NCOLS = 1, SHORT_PATLEN = 37;
+  if (SHORT_TEST)  patlen = SHORT_PATLEN;
+  for (int ncols = 0; ncols <= patlen; ncols++) {
+    if (SHORT_TEST) {
+      if (ncols < SHORT_NCOLS)  ncols = SHORT_NCOLS;
+      if (ncols > SHORT_NCOLS)  break;
+    } else if (ncols > COLS && ncols < patlen - COLS) {
+      ncols += ncols / 7;
+      if (ncols > patlen - COLS)  ncols = (patlen - COLS);
+    }
+    for (int lelen = 1; lelen <= 2; lelen++) {  // try both kinds of newline
+      istream_test_driver(VERBOSE,
+                          patlen, ncols, lelen,
+                          TEST_SET_POSITION, TEST_PUSH_BACK, TEST_EXPAND_REDUCE);
+    }
+  }
+}
+
+TEST_VM(istream, basic) {
+  const bool VERBOSE = false;
+  istream_test_driver(VERBOSE, false, false, false);
+}
+
+TEST_VM(istream, coverage) {
+  const bool VERBOSE = false;
+#ifdef ASSERT
+  istream_coverage_mode(0, cases, total, zeroes);
+  if (cases == 0)  return;
+  if (VERBOSE || zeroes != 0)
+    istream_coverage_mode(-1, cases, total, zeroes);
+  EXPECT_EQ(zeroes, 0) << "zeroes: " << zeroes << "/" << cases;
+#endif //ASSERT
+}
diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
index 7615e103d1a6a..e7627be7b8c0b 100644
--- a/test/hotspot/jtreg/ProblemList-Virtual.txt
+++ b/test/hotspot/jtreg/ProblemList-Virtual.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -27,10 +27,6 @@
 serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java 8308026 generic-all
 serviceability/jvmti/GetThreadListStackTraces/OneGetThreadListStackTraces.java 8308027 generic-all
 serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java 8264699 generic-all
-serviceability/dcmd/thread/PrintConcurrentLocksTest.java 8308033 generic-all
-serviceability/dcmd/thread/PrintTest.java 8308033 generic-all
-serviceability/dcmd/thread/ThreadDumpToFileTest.java 8308033 generic-all
-serviceability/tmtools/jstack/DaemonThreadTest.java 8308033 generic-all
 
 ####
 ## Classes not unloaded as expected (TODO, need to check if FJ keeps a reference)
diff --git a/test/hotspot/jtreg/ProblemList-generational-zgc.txt b/test/hotspot/jtreg/ProblemList-generational-zgc.txt
index a92751cc62106..4d5e985c0a677 100644
--- a/test/hotspot/jtreg/ProblemList-generational-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-generational-zgc.txt
@@ -116,5 +116,4 @@ serviceability/sa/sadebugd/SADebugDTest.java                  8307393   generic-
 
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64
 
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded002/TestDescription.java 8298302 generic-all
 vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java 8298991 linux-x64
diff --git a/test/hotspot/jtreg/ProblemList-zgc.txt b/test/hotspot/jtreg/ProblemList-zgc.txt
index 4684d8359bc55..d7d600aad490c 100644
--- a/test/hotspot/jtreg/ProblemList-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-zgc.txt
@@ -47,5 +47,4 @@ serviceability/sa/TestHeapDumpForInvokeDynamic.java           8315646   generic-
 
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64
 
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded002/TestDescription.java 8298302 generic-all
 vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java 8298991 linux-x64
diff --git a/test/hotspot/jtreg/compiler/c2/TestFindNode.java b/test/hotspot/jtreg/compiler/c2/TestFindNode.java
index 91a4cdb8d1697..ea7649c713ac7 100644
--- a/test/hotspot/jtreg/compiler/c2/TestFindNode.java
+++ b/test/hotspot/jtreg/compiler/c2/TestFindNode.java
@@ -27,10 +27,13 @@
  * @requires vm.debug == true & vm.flavor == "server"
  * @summary Test which uses some special flags in order to test Node::find() in debug builds which could result in an endless loop or a stack overflow crash.
  *
- * @run main/othervm -Xbatch -XX:CompileCommand=option,*::*,bool,Vectorize,true -XX:+PrintOpto -XX:+TraceLoopOpts compiler.c2.TestFindNode
+ * @run main/othervm -Xbatch -XX:CompileCommand=option,*::*,bool,Vectorize,true -XX:CompileCommand=memlimit,compiler.c2.TestFindNode::*,0
+ *                   -XX:+PrintOpto -XX:+TraceLoopOpts compiler.c2.TestFindNode
  */
 package compiler.c2;
 
+// Note; we disable the implicit memory limit of 1G in debug JVMs until JDK-8331283 is fixed
+
 public class TestFindNode {
     static volatile int[] iArr;
     static volatile int x;
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestDisableAutoVectOpcodes.java b/test/hotspot/jtreg/compiler/c2/irTests/TestDisableAutoVectOpcodes.java
index 31112a74eb11f..8ee3d2ecdd9e6 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestDisableAutoVectOpcodes.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestDisableAutoVectOpcodes.java
@@ -117,7 +117,7 @@ private static void testMulReductionVD() {
     }
 
     @Test
-    @IR(failOn = {IRNode.COUNTTRAILINGZEROS_VL})
+    @IR(failOn = {IRNode.COUNT_TRAILING_ZEROS_VL})
     public void testNumberOfTrailingZeros() {
         for (int i = 0; i < SIZE; ++i) {
             inta[i] = Long.numberOfTrailingZeros(longa[i]);
@@ -125,7 +125,7 @@ public void testNumberOfTrailingZeros() {
     }
 
     @Test
-    @IR(failOn = {IRNode.COUNTLEADINGZEROS_VL})
+    @IR(failOn = {IRNode.COUNT_LEADING_ZEROS_VL})
     public void testNumberOfLeadingZeros() {
         for (int i = 0; i < SIZE; ++i) {
             inta[i] = Long.numberOfLeadingZeros(longa[i]);
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/Test8331033.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test8331033.java
new file mode 100644
index 0000000000000..68bedd48c8fd3
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/Test8331033.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8331033
+ * @summary EA fails with "EA unexpected CallLeaf unsafe_setmemory" after JDK-8329331
+ * @requires vm.compMode != "Xint"
+ *
+ * @run main/othervm -Xbatch -XX:-TieredCompilation  Test8331033
+ *
+ */
+import java.lang.foreign.*;
+
+class MyClass {
+  public int field1;
+  public int field2;
+  public int field3;
+  public int field4;
+
+  public MyClass(int field1, int field2, int field3, int field4) {
+    this.field1 = field1;
+    this.field2 = field2;
+    this.field3 = field3;
+    this.field4 = field4;
+  }
+}
+
+public class Test8331033 {
+
+  public static int micro1(int ctr) {
+    // non-escaping object, EA sweepable, values are forwarded to users, additional
+    // bookeeping (SafepointScalarObjectNode) for eliminated objects at SafePoints
+    // With -XX:-Inline, constructor will not be inlined and hence AllocateNode are
+    // considered escapable.
+    MyClass obj = new MyClass(10, 20, 30, 40);
+    return obj.field1 * ctr + obj.field2 + obj.field3 + obj.field4;
+  }
+
+  public static int micro2(int ctr) {
+    // small known length arrays of size less than
+    // -XX:+EliminateAllocationArraySizeLimit are eliminatable if non-escaping.
+    int[] arr = new int[5];
+    arr[0] = 10;
+    arr[1] = 10;
+    arr[2] = 10;
+    arr[3] = 10;
+    arr[4] = 10;
+    // value forwarding will forward constants to expressions.
+    return ctr * arr[0] + arr[1] + arr[2] + arr[3] + arr[4];
+  }
+
+  public static int micro3(int ctr) {
+    int[] arr = new int[8];
+    MemorySegment ms = MemorySegment.ofArray(arr);
+    ms.fill((byte) 10);
+    return ctr * ms.get(ValueLayout.JAVA_INT, 12) +
+        ms.get(ValueLayout.JAVA_INT, 16) +
+        ms.get(ValueLayout.JAVA_INT, 20) +
+        ms.get(ValueLayout.JAVA_INT, 24);
+  }
+
+  public static void main(String[] args) {
+    {
+      int res = 0;
+      for (int i = 0; i < 100000; i++) {
+        res += micro1(i);
+      }
+      System.out.println("[res] " + res);
+    }
+    {
+      int res = 0;
+      for (int i = 0; i < 100000; i++) {
+        res += micro2(i);
+      }
+      System.out.println("[res] " + res);
+    }
+    {
+      int res = 0;
+      for (int i = 0; i < 100000; i++) {
+        res += micro3(i);
+      }
+      System.out.println("[res] " + res);
+    }
+  }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 449252b6badab..11f324a91e1a1 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1159,14 +1159,24 @@ public class IRNode {
         vectorNode(POPCOUNT_VL, "PopCountVL", TYPE_LONG);
     }
 
-    public static final String COUNTTRAILINGZEROS_VL = VECTOR_PREFIX + "COUNTTRAILINGZEROS_VL" + POSTFIX;
+    public static final String COUNT_TRAILING_ZEROS_VL = VECTOR_PREFIX + "COUNT_TRAILING_ZEROS_VL" + POSTFIX;
     static {
-        vectorNode(COUNTTRAILINGZEROS_VL, "CountTrailingZerosV", TYPE_LONG);
+        vectorNode(COUNT_TRAILING_ZEROS_VL, "CountTrailingZerosV", TYPE_LONG);
     }
 
-    public static final String COUNTLEADINGZEROS_VL = VECTOR_PREFIX + "COUNTLEADINGZEROS_VL" + POSTFIX;
+    public static final String COUNT_TRAILING_ZEROS_VI = VECTOR_PREFIX + "COUNT_TRAILING_ZEROS_VI" + POSTFIX;
     static {
-        vectorNode(COUNTLEADINGZEROS_VL, "CountLeadingZerosV", TYPE_LONG);
+        vectorNode(COUNT_TRAILING_ZEROS_VI, "CountTrailingZerosV", TYPE_INT);
+    }
+
+    public static final String COUNT_LEADING_ZEROS_VL = VECTOR_PREFIX + "COUNT_LEADING_ZEROS_VL" + POSTFIX;
+    static {
+        vectorNode(COUNT_LEADING_ZEROS_VL, "CountLeadingZerosV", TYPE_LONG);
+    }
+
+    public static final String COUNT_LEADING_ZEROS_VI = VECTOR_PREFIX + "COUNT_LEADING_ZEROS_VI" + POSTFIX;
+    static {
+        vectorNode(COUNT_LEADING_ZEROS_VI, "CountLeadingZerosV", TYPE_INT);
     }
 
     public static final String POPULATE_INDEX = PREFIX + "POPULATE_INDEX" + POSTFIX;
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index 939267234bd09..47cec9f5e13b4 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -102,7 +102,9 @@ public class IREncodingPrinter {
         // AArch64
         "sha3",
         "asimd",
-        "sve"
+        "sve",
+        // Riscv64
+        "zvbb"
     ));
 
     public IREncodingPrinter() {
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestDeepGraphVerifyIterativeGVN.java b/test/hotspot/jtreg/compiler/loopopts/TestDeepGraphVerifyIterativeGVN.java
index 87cbd8620d49b..bcb4a21136814 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestDeepGraphVerifyIterativeGVN.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestDeepGraphVerifyIterativeGVN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -28,11 +28,14 @@
  * @summary Test which causes a stack overflow segmentation fault with -XX:VerifyIterativeGVN=1 due to a too deep recursion in Node::verify_recur().
  *
  * @run main/othervm/timeout=600 -Xcomp -XX:VerifyIterativeGVN=1 -XX:CompileCommand=compileonly,compiler.loopopts.TestDeepGraphVerifyIterativeGVN::*
+ *                               -XX:CompileCommand=memlimit,compiler.loopopts.TestDeepGraphVerifyIterativeGVN::*,0
  *                               compiler.loopopts.TestDeepGraphVerifyIterativeGVN
  */
 
 package compiler.loopopts;
 
+// Note; we disable the implicit memory limit of 1G in debug JVMs until JDK-8331295 is fixed
+
 public class TestDeepGraphVerifyIterativeGVN
 {
     static volatile int[] iArr;
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
index 60ecaf0e4c89e..2a27aad8d5aa1 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,6 +144,11 @@ private static long testReductionOnPartiallyUnrolledLoopWithSwappedInputs(long[]
         applyIfAnd = {"SuperWordReductions", "true","UsePopCountInstruction", "true"},
         counts = {IRNode.ADD_REDUCTION_VI, ">= 1",
                   IRNode.POPCOUNT_VL, ">= 1"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"zvbb", "true"},
+        applyIfAnd = {"SuperWordReductions", "true","UsePopCountInstruction", "true"},
+        counts = {IRNode.ADD_REDUCTION_VI, ">= 1",
+                  IRNode.POPCOUNT_VL, ">= 1"})
     private static long testMapReductionOnGlobalAccumulator(long[] array) {
         acc = 0;
         for (int i = 0; i < array.length; i++) {
diff --git a/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java b/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
index c3ac0ae9c81b1..f1565db47d991 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +56,7 @@
 
 package compiler.print;
 
+import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
@@ -64,8 +66,12 @@
 
 public class CompileCommandMemLimit {
 
+    // Method we don't specify; default memlimit should apply
     final static String METHOD1 = "method1";
+    // Method we explicitly limit to 4K limit
     final static String METHOD2 = "method2";
+    // Method for which we explicitly disable a limit on the command line.
+    final static String METHOD3 = "method3";
 
     static boolean c2;
     static boolean test_crash;
@@ -77,27 +83,22 @@ public static void main(String[] args) throws Exception {
             default: throw new RuntimeException("invalid argument");
         }
         c2 = Boolean.parseBoolean(args[1]);
-        test(METHOD1, METHOD2);
-        test(METHOD2, METHOD1);
-    }
-
-    private static void test(String include, String exclude) throws Exception {
-
-        // A method that is known to cost compilers a bit of memory to compile
 
         List<String> options = new ArrayList<String>();
         options.add("-Xcomp");
         options.add("-XX:-Inline");
         options.add("-Xmx100m");
+        options.add("-XX:-CreateCoredumpOnCrash");
         options.add("-XX:CompileCommand=compileonly," + getTestClass() + "::*");
-        // We pass a very small size to guarantee the crash
-        options.add("-XX:CompileCommand=MemStat," + getTestMethod(include) + ",print");
-        if (test_crash) {
-            options.add("-XX:CompileCommand=MemLimit," + getTestMethod(include) + ",4k~crash");
-            options.add("-XX:-CreateCoredumpOnCrash");
-        } else {
-            options.add("-XX:CompileCommand=MemLimit," + getTestMethod(include) + ",4k");
-        }
+
+        // We want a final report
+        options.add("-XX:CompileCommand=MemStat,*.*,print");
+
+        // We limit method 2 to a very small limit that is guaranteed to trigger
+        options.add("-XX:CompileCommand=MemLimit," + getTestMethod(METHOD2) + ",4k" + (test_crash ? "~crash" : ""));
+
+        // We disable any limit set on method 3
+        options.add("-XX:CompileCommand=MemLimit," + getTestMethod(METHOD3) + ",0");
 
         if (c2) {
             options.add("-XX:-TieredCompilation");
@@ -110,20 +111,22 @@ private static void test(String include, String exclude) throws Exception {
 
         oa.reportDiagnosticSummary();
 
-        String expectedNameIncl = getTestMethod(include)
-                .replace('.', '/')
-                .replace("$", "\\$");
-        String expectedNameExcl = getTestMethod(exclude)
-                .replace('.', '/')
-                .replace("$", "\\$");
-
+        String method1regex = testMethodNameForRegex(getTestMethod(METHOD1));
+        String method2regex = testMethodNameForRegex(getTestMethod(METHOD2));
+        String method3regex = testMethodNameForRegex(getTestMethod(METHOD3));
         String ct = c2 ? "c2" : "c1";
 
         if (test_crash) {
             oa.shouldNotHaveExitValue(0);
             oa.shouldMatch("# *Internal Error.*");
-            oa.shouldMatch("# *fatal error: " + ct + " *" + expectedNameIncl + ".*: Hit MemLimit .*limit: 4096.*");
-            oa.shouldNotMatch(".*" + expectedNameExcl + ".*");
+
+            // method 2 should have hit its tiny limit
+            oa.shouldMatch("# *fatal error: " + ct + " *" + method2regex + ".*: Hit MemLimit .*limit: 4096.*");
+
+            // none of the other ones should have hit a limit
+            oa.shouldNotMatch(method1regex + ".*Hit MemLimit");
+            oa.shouldNotMatch(method3regex + ".*Hit MemLimit");
+
             // Make sure we get a non-zero-sized replay file (JDK-8331314)
             oa.shouldContain("# Compiler replay data is saved as:");
             String replayfile = oa.firstMatch("# (\\S+replay_pid\\d+\\.log)", 1);
@@ -137,18 +140,38 @@ private static void test(String include, String exclude) throws Exception {
             if (f.length() == 0) {
                 throw new RuntimeException("Replayfile " + replayfile + " has size 0");
             }
-
         } else {
-            // Should see trace output when methods are compiled
-            oa.shouldHaveExitValue(0)
-                    .shouldMatch(".*" + expectedNameIncl + ".*")
-                    .shouldNotMatch(".*" + expectedNameExcl + ".*");
+            oa.shouldHaveExitValue(0);
+
+            // In debug builds we have an inbuilt MemLimit. It is very high, so we don't expect it to fire in this test.
+            // But it will still show up in the final report.
+            String implicitMemoryLimit = Platform.isDebugBuild() ? "1024M" : "-";
+
+            // With C2, we print number of nodes, with C1 we don't
+            String numberNodesRegex = c2 ? "\\d+" : "-";
 
-            // Expect this log line
-            oa.shouldMatch(".*" + expectedNameIncl + ".*Hit MemLimit.*");
+            // method 2 should have hit its tiny limit
+            oa.shouldMatch(ct + " " + method2regex + ".*: Hit MemLimit \\(limit: 4096 now: \\d+\\)");
 
-            // Expect final output to contain "oom"
-            oa.shouldMatch(".*oom.*" + expectedNameIncl + ".*");
+            // neither of the other ones should have hit a limit
+            oa.shouldNotMatch(method1regex + ".*Hit MemLimit");
+            oa.shouldNotMatch(method3regex + ".*Hit MemLimit");
+
+            // Final report:
+            // Method 1 should show up as "ok" and with the default limit, e.g.
+            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
+            // 32728     0         32728     ok     -       1024M   0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
+            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +" + numberNodesRegex + " +" + implicitMemoryLimit + " +.* +" + method1regex);
+
+            // Method 2 should show up as "oom" and with its tiny limit, e.g.
+            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
+            // 32728     0         32728     oom     -       4096B   0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
+            oa.shouldMatch("\\d+ +\\d+ +\\d+ +oom +" + numberNodesRegex + " +4096B +.* +" + method2regex);
+
+            // Method 3 should show up as "ok", and with no limit, even in debug builds, e.g.
+            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
+            // 32728     0         32728     ok     -       -        0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
+            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +" + numberNodesRegex + " +- +.* +" + method3regex);
         }
     }
 
@@ -161,16 +184,23 @@ public static String getTestMethod(String method) {
         return getTestClass() + "::" + method;
     }
 
+    private static String testMethodNameForRegex(String m) {
+        return m.replace('.', '/')
+                .replace("$", "\\$");
+    }
+
     public static class TestMain {
         public static void main(String[] args) {
             method1();
             method2();
+            method3();
         }
 
         static long method1() {
             return System.currentTimeMillis();
         }
         static void method2() {}
+        static void method3() {}
     }
 }
 
diff --git a/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java b/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
index c0a99863fbf24..c2689d883721b 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +32,7 @@
 
 package compiler.print;
 
+import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
@@ -68,17 +70,26 @@ private static void test(String include, String exclude) throws Exception {
                 .replace("$", "\\$");
 
         // Should see trace output when methods are compiled
-        oa.shouldHaveExitValue(0)
-          .shouldMatch(".*" + expectedNameIncl + ".*")
-          .shouldNotMatch(".*" + expectedNameExcl + ".*");
+        oa.shouldHaveExitValue(0).
+                shouldMatch("Arena usage.*" + expectedNameIncl + ".*").
+                shouldNotMatch("Arena usage.*" + expectedNameExcl + ".*");
+
 
         // Should see final report
         // Looks like this:
-        // total     NA        RA        result  #nodes  time    type  #rc thread              method
-        // 211488    66440     77624     ok      13      0.057   c2    2   0x00007fb49428db70  compiler/print/CompileCommandPrintMemStat$TestMain::method1(()V)
-        oa.shouldMatch("total.*method");
-        oa.shouldMatch("\\d+ +\\d+ +\\d+ +\\S+ +\\d+.*" + expectedNameIncl + ".*");
-        oa.shouldNotMatch("\\d+ +\\d+ +\\d+ +\\S+ +\\d+.*" + expectedNameExcl + ".*");
+        // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
+        // 2149912   0         1986272   ok      -       -       0.101   c1    1   0x000000015180a600  jdk/internal/org/objectweb/asm/Frame::execute((IILjdk/internal/org/objectweb/asm/Symbol;Ljdk/internal/org/objectweb/asm/SymbolTable;)V)        oa.shouldMatch("total.*method");
+        // or
+        // 537784    98184     208536    ok      267     -       0.096   c2    1   0x0000000153019c00  jdk/internal/classfile/impl/BufWriterImpl::writeU1((I)V) 4521912   0         1986272   ok      -       -       0.101   c1    1   0x000000015180a600  jdk/internal/org/objectweb/asm/Frame::execute((IILjdk/internal/org/objectweb/asm/Symbol;Ljdk/internal/org/objectweb/asm/SymbolTable;)V)        oa.shouldMatch("total.*method");
+        oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +(\\d+|-) +.*" + expectedNameIncl + ".*");
+
+        // In debug builds, we have a default memory limit enabled. That implies MemStat. Therefore we
+        // expect to see all methods, not just the one we specified on the command line.
+        if (Platform.isDebugBuild()) {
+            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +(\\d+|-) +.*" + expectedNameExcl + ".*");
+        } else {
+            oa.shouldNotMatch(".*" + expectedNameExcl + ".*");
+        }
     }
 
     // Test class that is invoked by the sub process
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorReverseBytesTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorReverseBytesTest.java
index 154567922bd03..bfb95c0651c38 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorReverseBytesTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorReverseBytesTest.java
@@ -42,7 +42,8 @@
  * @library /test/lib /
  * @summary [vectorapi] REVERSE_BYTES for byte type should not emit any instructions
  * @requires vm.compiler2.enabled
- * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch == "aarch64"
+ * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch == "aarch64" |
+ *           (os.arch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
  * @modules jdk.incubator.vector
  *
  * @run driver compiler.vectorapi.VectorReverseBytesTest
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
index abbabca0f2a1e..db0b563d1fea0 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
@@ -27,7 +27,8 @@
 * @summary Test vectorization of numberOfTrailingZeros/numberOfLeadingZeros for Long
 * @requires vm.compiler2.enabled
 * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") |
-*           (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*")
+*           (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*") |
+*           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
 * @library /test/lib /
 * @run driver compiler.vectorization.TestNumberOfContinuousZeros
 */
@@ -39,8 +40,10 @@
 import jdk.test.lib.Asserts;
 
 public class TestNumberOfContinuousZeros {
-    private long[] input;
-    private int[] output;
+    private long[] inputLong;
+    private int[] outputLong;
+    private int[] inputInt;
+    private int[] outputInt;
     private static final int LEN = 1024;
     private Random rng;
 
@@ -49,39 +52,71 @@ public static void main(String args[]) {
     }
 
     public TestNumberOfContinuousZeros() {
-        input = new long[LEN];
-        output = new int[LEN];
+        inputLong = new long[LEN];
+        outputLong = new int[LEN];
+        inputInt = new int[LEN];
+        outputInt = new int[LEN];
         rng = new Random(42);
         for (int i = 0; i < LEN; ++i) {
-            input[i] = rng.nextLong();
+            inputLong[i] = rng.nextLong();
+            inputInt[i] = rng.nextInt();
         }
     }
 
     @Test
-    @IR(counts = {IRNode.COUNTTRAILINGZEROS_VL, "> 0"})
-    public void vectorizeNumberOfTrailingZeros() {
+    @IR(counts = {IRNode.COUNT_TRAILING_ZEROS_VL, "> 0"})
+    public void vectorizeNumberOfTrailingZerosLong() {
         for (int i = 0; i < LEN; ++i) {
-            output[i] = Long.numberOfTrailingZeros(input[i]);
+            outputLong[i] = Long.numberOfTrailingZeros(inputLong[i]);
         }
     }
 
     @Test
-    @IR(counts = {IRNode.COUNTLEADINGZEROS_VL, "> 0"})
-    public void vectorizeNumberOfLeadingZeros() {
+    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
+    public void vectorizeNumberOfLeadingZerosLong() {
         for (int i = 0; i < LEN; ++i) {
-            output[i] = Long.numberOfLeadingZeros(input[i]);
+            outputLong[i] = Long.numberOfLeadingZeros(inputLong[i]);
         }
     }
 
-    @Run(test = {"vectorizeNumberOfTrailingZeros", "vectorizeNumberOfLeadingZeros"})
-    public void checkResult() {
-        vectorizeNumberOfTrailingZeros();
+    @Run(test = {"vectorizeNumberOfTrailingZerosLong", "vectorizeNumberOfLeadingZerosLong"})
+    public void checkResultLong() {
+        vectorizeNumberOfTrailingZerosLong();
         for (int i = 0; i < LEN; ++i) {
-            Asserts.assertEquals(output[i], Long.numberOfTrailingZeros(input[i]));
+            Asserts.assertEquals(outputLong[i], Long.numberOfTrailingZeros(inputLong[i]));
         }
-        vectorizeNumberOfLeadingZeros();
+        vectorizeNumberOfLeadingZerosLong();
         for (int i = 0; i < LEN; ++i) {
-            Asserts.assertEquals(output[i], Long.numberOfLeadingZeros(input[i]));
+            Asserts.assertEquals(outputLong[i], Long.numberOfLeadingZeros(inputLong[i]));
+        }
+    }
+
+
+    @Test
+    @IR(counts = {IRNode.COUNT_TRAILING_ZEROS_VI, "> 0"})
+    public void vectorizeNumberOfTrailingZerosInt() {
+        for (int i = 0; i < LEN; ++i) {
+            outputInt[i] = Integer.numberOfTrailingZeros(inputInt[i]);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VI, "> 0"})
+    public void vectorizeNumberOfLeadingZerosInt() {
+        for (int i = 0; i < LEN; ++i) {
+            outputInt[i] = Integer.numberOfLeadingZeros(inputInt[i]);
+        }
+    }
+
+    @Run(test = {"vectorizeNumberOfTrailingZerosInt", "vectorizeNumberOfLeadingZerosInt"})
+    public void checkResultInt() {
+        vectorizeNumberOfTrailingZerosInt();
+        for (int i = 0; i < LEN; ++i) {
+            Asserts.assertEquals(outputInt[i], Integer.numberOfTrailingZeros(inputInt[i]));
+        }
+        vectorizeNumberOfLeadingZerosInt();
+        for (int i = 0; i < LEN; ++i) {
+            Asserts.assertEquals(outputInt[i], Integer.numberOfLeadingZeros(inputInt[i]));
         }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVector.java b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVector.java
index a6daa5bce063a..4a4370fd2d112 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVector.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,18 +40,22 @@ public class TestPopCountVector {
 
     public static void main(String args[]) {
         TestPopCountVector test = new TestPopCountVector();
+        int err = 0;
 
         for (int i = 0; i < 10_000; ++i) {
           test.vectorizeBitCount();
         }
         System.out.println("Checking popcount result");
-        test.checkResult();
+        err += test.checkResult();
 
         for (int i = 0; i < 10_000; ++i) {
           test.vectorizeBitCount();
         }
         System.out.println("Checking popcount result");
-        test.checkResult();
+        err += test.checkResult();
+        if (err > 0) {
+            throw new RuntimeException("Error!");
+        }
     }
 
     public TestPopCountVector() {
@@ -68,13 +72,17 @@ public void vectorizeBitCount() {
         }
     }
 
-    public void checkResult() {
+    public int checkResult() {
+        int err = 0;
         for (int i = 0; i < LEN; ++i) {
             int expected = Integer.bitCount(input[i]);
             if (output[i] != expected) {
-                throw new RuntimeException("Invalid result: output[" + i + "] = " + output[i] + " != " + expected);
+                err++;
+                System.err.println("Invalid result: output[" + i + "] = " + output[i] + " != " + expected +
+                                   ", input[" + i + "] == " + Integer.toBinaryString(input[i]));
             }
         }
+        return err;
     }
 }
 
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
index 20912582b7f5d..e382e828790b6 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,12 +26,14 @@
 * @summary Test vectorization of popcount for Long
 * @requires vm.compiler2.enabled
 * @requires ((os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64") & vm.cpu.features ~= ".*avx512bw.*") |
-*           os.simpleArch == "aarch64"
+*           os.simpleArch == "aarch64" |
+*           (os.arch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
 * @library /test/lib /
 * @run driver compiler.vectorization.TestPopCountVectorLong
 */
 
 package compiler.vectorization;
+
 import compiler.lib.ir_framework.*;
 import java.util.Random;
 
@@ -62,16 +64,22 @@ public void vectorizeBitCount() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = Long.bitCount(input[i]);
         }
-        checkResult();
+        if (checkResult() > 0) {
+            throw new RuntimeException("Error!");
+        }
     }
 
-    public void checkResult() {
+    public int checkResult() {
+        int err = 0;
         for (int i = 0; i < LEN; ++i) {
             int expected = Long.bitCount(input[i]);
             if (output[i] != expected) {
-                throw new RuntimeException("Invalid result: output[" + i + "] = " + output[i] + " != " + expected);
+                err++;
+                System.err.println("Invalid result: output[" + i + "] = " + output[i] + " != " + expected +
+                                   ", input[" + i + "] == " + Long.toBinaryString(input[i]));
             }
         }
+        return err;
     }
 }
 
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java b/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
index 47813e2790e8e..71c9114121c14 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
@@ -25,7 +25,8 @@
  * @bug 8288112
  * @summary Auto-vectorization of ReverseBytes operations.
  * @requires vm.compiler2.enabled
- * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.simpleArch == "AArch64"
+ * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.simpleArch == "AArch64" |
+ *           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
  * @library /test/lib /
  * @run driver compiler.vectorization.TestReverseBytes
  */
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
index d851af1ff59e2..6131e58d15624 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
@@ -227,6 +227,9 @@ public char[] vectorUnsignedShiftRight() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
         counts = {IRNode.REVERSE_BYTES_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"zvbb", "true"},
+        counts = {IRNode.REVERSE_BYTES_VS, ">0"})
     public char[] reverseBytesWithChar() {
         char[] res = new char[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
index c9a06c113605a..363daf3a115ff 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
@@ -250,6 +250,9 @@ public short[] vectorUnsignedShiftRight() {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
         counts = {IRNode.REVERSE_BYTES_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"zvbb", "true"},
+        counts = {IRNode.REVERSE_BYTES_VS, ">0"})
     public short[] reverseBytesWithShort() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
index dadc262cd5a4e..6bcb706fa7a6a 100644
--- a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
+++ b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
@@ -26,6 +26,7 @@
 /*
  * @test
  * @summary Test container info for cgroup v2
+ * @key cgroups
  * @requires docker.support
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java b/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
index 5af005063c171..fd78486166327 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
@@ -71,42 +71,42 @@ public static void checkMinInitialErgonomics(String gcflag) throws Exception {
     long maxHeapSize = largeValue + (2 * 1024 * 1024);
 
     // -Xms is not set
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue }, values, smallValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + largeValue }, values, largeValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=0" }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=" + smallValue }, values, -1, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=" + largeValue }, values, -1, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=0" }, values, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue }, smallValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + largeValue }, largeValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=0" }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=" + smallValue }, -1, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=" + largeValue }, -1, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=0" }, -1, -1);
     // Some extra checks when both are set.
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + smallValue }, values, smallValue, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + largeValue }, values, smallValue, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + largeValue, "-XX:InitialHeapSize=" + largeValue }, values, largeValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + smallValue }, smallValue, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + largeValue }, smallValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + largeValue, "-XX:InitialHeapSize=" + largeValue }, largeValue, largeValue);
 
     // -Xms is set to zero
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0" }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue }, values, smallValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + largeValue }, values, largeValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=0" }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=" + smallValue }, values, -1, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=" + largeValue }, values, -1, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=0" }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + smallValue }, values, smallValue, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + largeValue }, values, smallValue, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + largeValue, "-XX:InitialHeapSize=" + largeValue }, values, largeValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0" }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue }, smallValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + largeValue }, largeValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=0" }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=" + smallValue }, -1, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=" + largeValue }, -1, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=0" }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + smallValue }, smallValue, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + largeValue }, smallValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + largeValue, "-XX:InitialHeapSize=" + largeValue }, largeValue, largeValue);
 
     // -Xms is set to small value
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:MinHeapSize=" + smallValue }, values, smallValue, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:MinHeapSize=0" }, values, -1, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=" + smallValue }, values, smallValue, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=" + largeValue }, values, smallValue, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=0" }, values, smallValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:MinHeapSize=" + smallValue }, smallValue, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:MinHeapSize=0" }, -1, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=" + smallValue }, smallValue, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=" + largeValue }, smallValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=0" }, smallValue, -1);
 
     // -Xms is set to large value
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue }, values, largeValue, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue, "-XX:InitialHeapSize=0" }, values, largeValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue, "-XX:MinHeapSize=0" }, values, -1, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue }, largeValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue, "-XX:InitialHeapSize=0" }, largeValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue, "-XX:MinHeapSize=0" }, -1, largeValue);
   }
 
   private static long align_up(long value, long alignment) {
@@ -244,7 +244,7 @@ private static void getMinInitialMaxHeap(String[] args, MinInitialMaxValues val)
    * Verify whether the VM automatically synchronizes minimum and initial heap size if only
    * one is given for the GC specified.
    */
-  public static void checkErgonomics(String[] args, long[] newoldsize,
+  public static void checkErgonomics(String[] args,
     long expectedMin, long expectedInitial) throws Exception {
 
     MinInitialMaxValues v = new MinInitialMaxValues();
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java
index b50b0ad47d943..6aa5964d8a693 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @bug 8216184
  * @summary Test the handling of long path to the classlist file.
  * @requires vm.cds
  * @library /test/lib
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java
index 1275f752c050e..37c59a0d0a3ea 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -22,6 +22,12 @@
  *
  */
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import jdk.test.lib.cds.CDSOptions;
+import jdk.test.lib.cds.CDSTestUtils;
+
 /*
  * @test
  * @summary Tests the format checking of class list format.
@@ -94,39 +100,76 @@ appJar, classlist(
 
         // Good input:
         dumpShouldPass(
-            "TESTCASE A6: extraneous spaces, tab characters and trailing new line characters",
+            "TESTCASE A6: extraneous spaces, tab characters, trailing new line characters, and trailing comment line",
             appJar, classlist(
                 "Hello   ",                   // trailing spaces
                 "java/lang/Object\tid:\t1",   // \t instead of ' '
                 "CustomLoadee id: 2 super: 1 source: " + customJarPath,
                 "CustomInterface2_ia id: 3 super: 1 source: " + customJarPath + " ",
                 "CustomInterface2_ib id: 4 super: 1 source: " + customJarPath + "\t\t\r" ,
-                "CustomLoadee2 id: 5 super: 1 interfaces: 3 4 source: " + customJarPath      // preceding spaces
+                "CustomLoadee2 id: 5 super: 1 interfaces: 3 4 source: " + customJarPath,      // preceding spaces
+                "#last line is a comment"
             ));
 
-        int _max_allowed_line = 4096; // Must match ClassListParser::_max_allowed_line in C code.
-        int _line_buf_extra = 10;     // Must match ClassListParser::_line_buf_extra in C code.
-        StringBuffer sbuf = new StringBuffer();
-        for (int i=0; i<_max_allowed_line+1; i++) {
-          sbuf.append("x");
+        // Tests for corner cases in the C++ class LineReader, or invalid UTF8. These can't
+        // be tested with dumpShouldPass/dumpShouldFail as we need to prepare a special class
+        // list file.
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 6500; i++) {
+            sb.append("X123456789");
         }
 
-        dumpShouldFail(
-            "TESTCASE A7: bad input - line too long",
-            appJar, classlist(
-                sbuf.toString()
-            ),
-            "input line too long (must be no longer than " + _max_allowed_line + " chars");
+        {
+            System.out.println("TESTCASE A7.1: Long line (65000 chars)");
+            String longName = sb.toString(); // 65000 chars long
+            String classList = "LongLine.classlist";
+            try (FileWriter fw = new FileWriter(classList)) {
+                fw.write(longName + "\n");
+            }
+            CDSOptions opts = (new CDSOptions())
+                .addPrefix("-XX:ExtraSharedClassListFile=" + classList, "-Xlog:cds");
+            CDSTestUtils.createArchiveAndCheck(opts)
+                .shouldContain("Preload Warning: Cannot find " + longName);
+        }
 
-        for (int i=0; i<_line_buf_extra + 1000; i++) {
-          sbuf.append("X");
+        {
+            System.out.println("TESTCASE A7.2: Name Length > Symbol::max_length()");
+            String tooLongName = sb.toString() + sb.toString();
+            String classList = "TooLongLine.classlist";
+            try (FileWriter fw = new FileWriter(classList)) {
+                fw.write("java/lang/Object\n");
+                fw.write(tooLongName + "\n");
+            }
+            CDSOptions opts = (new CDSOptions())
+                .addPrefix("-XX:ExtraSharedClassListFile=" + classList, "-Xlog:cds");
+            CDSTestUtils.createArchive(opts)
+                .shouldContain(classList + ":2 class name too long") // test line number as well.
+                .shouldHaveExitValue(1);
         }
 
-        dumpShouldFail(
-            "TESTCASE A8: bad input - line too long: try to overflow C buffer",
-            appJar, classlist(
-                sbuf.toString()
-            ),
-            "input line too long (must be no longer than " + _max_allowed_line + " chars");
+        {
+            System.out.println("TESTCASE A7.3: File doesn't end with newline");
+            String classList = "NoTrailingNewLine.classlist";
+            try (FileWriter fw = new FileWriter(classList)) {
+                fw.write("No/Such/ClassABCD");
+            }
+            CDSOptions opts = (new CDSOptions())
+                .addPrefix("-XX:ExtraSharedClassListFile=" + classList, "-Xlog:cds");
+            CDSTestUtils.createArchiveAndCheck(opts)
+                .shouldContain("Preload Warning: Cannot find No/Such/ClassABCD");
+        }
+        {
+            System.out.println("TESTCASE A7.4: invalid UTF8 character");
+            String classList = "BadUTF8.classlist";
+            try (FileOutputStream fos = new FileOutputStream(classList)) {
+                byte chars[] = new byte[] { (byte)0xa0, (byte)0xa1, '\n'};
+                fos.write(chars);
+            }
+            CDSOptions opts = (new CDSOptions())
+                .addPrefix("-XX:ExtraSharedClassListFile=" + classList, "-Xlog:cds");
+            CDSTestUtils.createArchive(opts)
+                .shouldContain(classList + ":1 class name is not valid UTF8") // test line number as well.
+                .shouldHaveExitValue(1);
+        }
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSLambdaInvoker.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSLambdaInvoker.java
index f3485ee26a6d4..5d78d2bdd78c6 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSLambdaInvoker.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSLambdaInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,9 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
+/**
+ * This is launched from TestLambdaInvokers.
+ */
 public class CDSLambdaInvoker {
     public static void main(String args[]) throws Throwable {
         // The following calls trigger the generation of new Species classes
@@ -44,6 +47,10 @@ public static void main(String args[]) throws Throwable {
                                               boolean.class, Object.class, long.class, double.class);
         MethodHandle mh = lookup.findStatic(CDSLambdaInvoker.class, "callme", mt);
         mh.invokeExact(4.0f, 5.0, 6, true, (Object)args, 7L, 8.0);
+
+        mh = MethodHandles.dropArguments(MethodHandles.zero(Object.class), 0, Object.class, int.class);
+        MethodHandle inv = MethodHandles.invoker(mh.type());
+        invoke(inv, mh, args, 3);
     }
 
     private static Object invoke(MethodHandle mh, Object ... args) throws Throwable {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java
index 9a16f55e149da..3769ab97b9378 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,7 +26,7 @@
  * @test
  * @key randomness
  * @summary test archive lambda invoker species type in dynamic dump
- * @bug 8280767
+ * @bug 8280767 8327499
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive
  * @compile CDSLambdaInvoker.java
@@ -59,6 +59,7 @@ private static void doTest(String topArchiveName) throws Exception {
              "-Xlog:cds",
              "-Xlog:cds+dynamic=debug",
              "-Xlog:class+load",
+             "-Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true",
              "-cp",
              jarFile,
              mainClass)
@@ -69,6 +70,10 @@ private static void doTest(String topArchiveName) throws Exception {
                  // java.lang.invoke.BoundMethodHandle$Species_JL is generated from CDSLambdaInvoker and
                  // stored in the dynamic archive
                  output.shouldContain("java.lang.invoke.BoundMethodHandle$Species_JL source: shared objects file (top)");
+
+                 // java.lang.invoke.Invokers$Holder has invoker(Object,Object,Object,int)Object available
+                 // from the archives
+                 output.shouldContain("[LF_RESOLVE] java.lang.invoke.Invokers$Holder invoker L3I_L (success)");
              });
     }
 
diff --git a/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java b/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java
index e4af11c32615c..29c462a56b393 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import org.testng.SkipException;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 
@@ -171,6 +172,9 @@ public void run(CommandExecutor executor) {
 
     @Test
     public void jmx() {
+        if (Thread.currentThread().isVirtual()) {
+            throw new SkipException("skipping test since current thread is virtual thread");
+        }
         run(new JMXExecutor());
     }
 }
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java
index d7915e8901a8f..23e9474ad4a0c 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -38,6 +38,7 @@ public class DaemonThreadTest {
     static class NormalThread extends Thread {
 
         NormalThread() {
+            setDaemon(false);
         }
 
         @Override
diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt
index c352e8a95c1d0..e3b0a92285746 100644
--- a/test/jdk/ProblemList-Virtual.txt
+++ b/test/jdk/ProblemList-Virtual.txt
@@ -33,9 +33,6 @@ com/sun/jdi/cds/CDSBreakpointTest.java 8307778 generic-all
 com/sun/jdi/cds/CDSDeleteAllBkptsTest.java 8307778 generic-all
 com/sun/jdi/cds/CDSFieldWatchpoints.java 8307778 generic-all
 
-sun/tools/jcmd/JcmdOutputEncodingTest.java 8308033 generic-all
-sun/tools/jstack/BasicJStackTest.java 8308033 generic-all
-
 javax/management/remote/mandatory/connection/BrokenConnectionTest.java 8308035 windows-x64
 
 javax/management/remote/mandatory/loading/MissingClassTest.java 8145413 windows-x64
diff --git a/test/jdk/com/sun/net/httpserver/BasicAuthToken.java b/test/jdk/com/sun/net/httpserver/BasicAuthToken.java
new file mode 100644
index 0000000000000..a393ac4c5ddb0
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/BasicAuthToken.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8144100
+ * @summary checking token sent by client should be done in case-insensitive manner
+ * @run main BasicAuthToken
+ */
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.Base64;
+import com.sun.net.httpserver.Authenticator;
+import com.sun.net.httpserver.BasicAuthenticator;
+import com.sun.net.httpserver.HttpServer;
+
+public class BasicAuthToken {
+    private static final String CRLF = "\r\n";
+    private static final String someContext = "/test";
+
+    public static void main(String[] args) throws Exception {
+        HttpServer server = server();
+        try {
+            client(server.getAddress().getPort());
+        } finally {
+            server.stop(0);
+        }
+    }
+
+    static HttpServer server() throws Exception {
+        String realm = "someRealm";
+        ServerAuthenticator authenticator = new ServerAuthenticator(realm);
+        HttpServer server = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
+        server.createContext(someContext, exchange -> {
+            if (authenticator.authenticate(exchange) instanceof Authenticator.Failure) {
+                exchange.sendResponseHeaders(401, -1);
+                exchange.close();
+                return;
+            }
+            exchange.sendResponseHeaders(200, -1);
+            exchange.close();
+        }).setAuthenticator(authenticator);
+        server.start();
+        return server;
+    }
+
+    static void client(int port) throws Exception {
+        try (Socket socket = new Socket(InetAddress.getLoopbackAddress(), port)) {
+            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            String credentials = "username:password";
+            String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes());
+            writer.write("GET " + someContext + " HTTP/1.1" + CRLF);
+            writer.write("Host: localhost:" + port + CRLF);
+            writer.write("User-Agent: Java/" + System.getProperty("java.version") + CRLF);
+            writer.write("Authorization: BAsIc " + encodedCredentials + CRLF);
+            writer.write(CRLF);
+            writer.flush();
+
+            System.err.println("Server response");
+            String statusLine = reader.readLine();
+            System.err.println(statusLine);
+
+            if (!statusLine.startsWith("HTTP/1.1 200")) {
+                throw new RuntimeException("unexpected status line: " + statusLine);
+            }
+            if (!ServerAuthenticator.wasChecked()) {
+                throw new RuntimeException("Authenticator wasn't invoked");
+            }
+        }
+    }
+
+
+    static class ServerAuthenticator extends BasicAuthenticator {
+        private static volatile boolean invoked = false;
+
+        ServerAuthenticator(String realm) {
+            super(realm);
+        }
+
+        public static boolean wasChecked() {
+            return invoked;
+        }
+
+        @Override
+        public boolean checkCredentials(String username, String password) {
+            String validUsername = "username", validPassword = "password";
+            invoked = true;
+            return username.equals(validUsername) && password.equals(validPassword);
+        }
+    }
+}
diff --git a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
index ded0474071b15..291b74f26692b 100644
--- a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
@@ -50,6 +50,7 @@
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsParameters;
 import com.sun.net.httpserver.HttpsServer;
+import jdk.internal.util.OperatingSystem;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
 import org.junit.jupiter.api.Test;
@@ -68,12 +69,14 @@
  * @bug 8326381
  * @summary verifies that the setNeedClientAuth() and setWantClientAuth()
  *          methods on HttpsParameters class work as expected
+ * @modules java.base/jdk.internal.util
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.test.lib.net.URIBuilder
  * @run junit HttpsParametersClientAuthTest
  */
 public class HttpsParametersClientAuthTest {
 
+    private static final boolean IS_WINDOWS = OperatingSystem.isWindows();
     private static final AtomicInteger TID = new AtomicInteger();
     private static final ThreadFactory SRV_THREAD_FACTORY = (r) -> {
         final Thread t = new Thread(r);
@@ -220,9 +223,11 @@ public void configure(final HttpsParameters params) {
                             throw ioe;
                         }
                         // verify it failed due to right reason
-                        Throwable cause = ioe;
+                        Throwable cause = ioe.getCause();
                         while (cause != null) {
-                            // either of SocketException or SSLHandshakeException are OK
+                            // either of SocketException or SSLHandshakeException are OK.
+                            // additionally on Windows we accept even IOException
+                            // (caused by WSAECONNABORTED)
                             if (cause instanceof SocketException se) {
                                 final String msg = se.getMessage();
                                 assertTrue(msg != null && msg.contains("Connection reset"),
@@ -235,6 +240,12 @@ public void configure(final HttpsParameters params) {
                                         "unexpected message in SSLHandshakeException: " + msg);
                                 System.out.println("received the expected exception: " + she);
                                 break;
+                            } else if (IS_WINDOWS && cause instanceof IOException winIOE) {
+                                // on Windows we sometimes receive this exception, which is
+                                // acceptable
+                                System.out.println("(windows) received the expected exception: "
+                                        + winIOE);
+                                break;
                             }
                             cause = cause.getCause();
                         }
diff --git a/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java b/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java
new file mode 100644
index 0000000000000..a66f25dd487d9
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 6968351
+ * @summary  tcp no delay not required for small payloads
+ * @requires vm.compMode != "Xcomp"
+ * @library /test/lib
+ * @run main/othervm/timeout=5 -Dsun.net.httpserver.nodelay=false  TcpNoDelayNotRequired
+ */
+
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpContext;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+import java.util.logging.StreamHandler;
+
+public class TcpNoDelayNotRequired {
+
+    public static final Logger LOGGER = Logger.getLogger("sun.net.www.protocol.http");
+
+    public static void main (String[] args) throws Exception {
+
+        java.util.logging.Handler outHandler = new StreamHandler(System.out,
+                new SimpleFormatter());
+        outHandler.setLevel(Level.FINEST);
+        LOGGER.setLevel(Level.FINEST);
+        LOGGER.addHandler(outHandler);
+
+        InetAddress loopback = InetAddress.getLoopbackAddress();
+        InetSocketAddress addr = new InetSocketAddress (loopback, 0);
+
+        SSLContext sslContext = new SimpleSSLContext().get();
+
+        HttpServer httpServer = HttpServer.create (addr, 0);
+        testHttpServer("http",httpServer,sslContext);
+
+        HttpsServer httpsServer = HttpsServer.create (addr, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+
+        testHttpServer("https",httpsServer,sslContext);
+    }
+
+    private static void testHttpServer(String scheme,HttpServer server,SSLContext sslContext) throws Exception {
+        HttpContext ctx = server.createContext ("/test", new Handler());
+        HttpContext ctx2 = server.createContext ("/chunked", new ChunkedHandler());
+        ExecutorService executor = Executors.newCachedThreadPool();
+        server.setExecutor (executor);
+        server.start ();
+        try {
+            try (HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build()) {
+                long start = System.currentTimeMillis();
+                for (int i = 0; i < 1000; i++) {
+                    var uri = URIBuilder.newBuilder().scheme(scheme).loopback().port(server.getAddress().getPort()).path("/test").build();
+                    var response = client.send(HttpRequest.newBuilder(uri).build(), HttpResponse.BodyHandlers.ofString());
+                    if (!response.body().equals("hello"))
+                        throw new IllegalStateException("incorrect body " + response.body());
+                }
+                for (int i = 0; i < 1000; i++) {
+                    var uri = URIBuilder.newBuilder().scheme(scheme).loopback().port(server.getAddress().getPort()).path("/chunked").build();
+                    var response = client.send(HttpRequest.newBuilder(uri).build(), HttpResponse.BodyHandlers.ofString());
+                    if (!response.body().equals("hello"))
+                        throw new IllegalStateException("incorrect body " + response.body());
+                }
+                long time = System.currentTimeMillis() - start;
+                System.out.println("time " + time);
+            }
+        } finally {
+            server.stop(0);
+        }
+        executor.shutdown();
+    }
+
+    static class Handler implements HttpHandler {
+        public void handle (HttpExchange t)
+                throws IOException
+        {
+            Headers rmap = t.getResponseHeaders();
+            try (var is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            rmap.add("content-type","text/plain");
+            t.sendResponseHeaders(200,5);
+            try (var os = t.getResponseBody()) {
+                os.write("hello".getBytes(StandardCharsets.ISO_8859_1));
+            }
+        }
+    }
+    static class ChunkedHandler implements HttpHandler {
+        public void handle (HttpExchange t)
+                throws IOException
+        {
+            Headers rmap = t.getResponseHeaders();
+            try (var is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            rmap.add("content-type","text/plain");
+            t.sendResponseHeaders(200,0);
+            try (var os = t.getResponseBody()) {
+                os.write("hello".getBytes(StandardCharsets.ISO_8859_1));
+            }
+        }
+    }
+}
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
index b313464092508..3206b62188a69 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -76,6 +76,8 @@ public class SimpleFileServerTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
+    static final String EXPECTED_LAST_MODIFIED_OF_FAVICON = "Mon, 23 May 1995 11:11:11 GMT";
+
     @BeforeTest
     public void setup() throws IOException {
         if (ENABLE_LOGGING) {
@@ -142,6 +144,65 @@ public void testDirectoryGET() throws Exception {
         }
     }
 
+    @Test
+    public void testFavIconGET() throws Exception {
+        var root = Files.createDirectory(TEST_DIR.resolve("testFavIconGET"));
+
+        var server = SimpleFileServer.createFileServer(LOOPBACK_ADDR, root, OutputLevel.VERBOSE);
+        server.start();
+        try {
+            // expect built-in icon
+            var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
+            var request = HttpRequest.newBuilder(uri(server, "favicon.ico")).build();
+            var response = client.send(request, BodyHandlers.ofString());
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
+            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
+
+            // expect custom (and broken) icon
+            var file = Files.writeString(root.resolve("favicon.ico"), "broken icon", CREATE);
+            try {
+                var lastModified = getLastModified(file);
+                var expectedLength = Long.toString(Files.size(file));
+                response = client.send(request, BodyHandlers.ofString());
+                assertEquals(response.statusCode(), 200);
+                assertEquals(response.headers().firstValue("content-type").get(), "application/octet-stream");
+                assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
+                assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
+            } finally {
+                Files.delete(file);
+            }
+
+            // expect built-in icon
+            response = client.send(request, BodyHandlers.ofString());
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
+            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
+        } finally {
+            server.stop(0);
+        }
+    }
+
+    @Test
+    public void testFavIconHEAD() throws Exception {
+        var root = Files.createDirectory(TEST_DIR.resolve("testFavIconHEAD"));
+
+        var server = SimpleFileServer.createFileServer(LOOPBACK_ADDR, root, OutputLevel.VERBOSE);
+        server.start();
+        try {
+            var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
+            var request = HttpRequest.newBuilder(uri(server, "favicon.ico"))
+                    .method("HEAD", BodyPublishers.noBody()).build();
+            var response = client.send(request, BodyHandlers.ofString());
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
+            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
+            assertEquals(response.body(), "");
+        } finally {
+            server.stop(0);
+        }
+    }
+
     @Test
     public void testFileHEAD() throws Exception {
         var root = Files.createDirectory(TEST_DIR.resolve("testFileHEAD"));
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java b/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
index 8197fd436e759..18a1f060c4897 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
@@ -25,7 +25,7 @@
  * @test
  * @summary Test to stress directory listings
  * @library /test/lib
- * @run testng/othervm/timeout=180 -Dsun.net.httpserver.nodelay=true StressDirListings
+ * @run testng/othervm/timeout=180 StressDirListings
  */
 
 import java.io.IOException;
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/IPv6BoundHost.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/IPv6BoundHost.java
new file mode 100644
index 0000000000000..04c9c3c6fc63c
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/IPv6BoundHost.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+import jdk.internal.util.OperatingSystem;
+import jdk.test.lib.net.IPSupport;
+import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
+
+/*
+ * @test
+ * @bug 8332020
+ * @summary verifies that when jwebserver is launched with a IPv6 bind address
+ *          then the URL printed contains the correct host literal
+ * @modules jdk.httpserver java.base/jdk.internal.util
+ * @library /test/lib
+ * @build jdk.test.lib.net.IPSupport
+ * @run driver IPv6BoundHost
+ */
+public class IPv6BoundHost {
+
+    private static final Path JDK_BIN_DIR = Path.of(System.getProperty("java.home")).resolve("bin");
+    private static final Path JWEBSERVER_BINARY = OperatingSystem.isWindows()
+            ? JDK_BIN_DIR.resolve("jwebserver.exe") : JDK_BIN_DIR.resolve("jwebserver");
+
+    public static void main(final String[] args) throws Exception {
+        IPSupport.printPlatformSupport(System.err); // for debug purposes
+        if (!IPSupport.hasIPv6()) {
+            throw new SkippedException("Skipping test - IPv6 is not supported");
+        }
+        final String output = launchJwebserverAndExit(List.of("-b", "::1", "-p", "0"));
+        if (output.contains("URL http://[::1]:")
+                || output.contains("URL http://[0:0:0:0:0:0:0:1]:")) {
+            // found expected content
+            System.out.println("found expected URL in jwebserver output");
+        } else {
+            throw new AssertionError("missing IPv6 address in jwebserver process output");
+        }
+    }
+
+    private static String launchJwebserverAndExit(final List<String> args) throws Exception {
+        final Predicate<String> waitForLine = (s) -> s.startsWith("URL http://");
+        final StringBuilder sb = new StringBuilder();  // stdout & stderr
+        final List<String> cmd = new ArrayList<>();
+        cmd.add(JWEBSERVER_BINARY.toString());
+        cmd.addAll(args);
+        // start the process and await the waitForLine before returning
+        final Process p = ProcessTools.startProcess("8332020-test", new ProcessBuilder(cmd),
+                line -> sb.append(line).append("\n"),
+                waitForLine,
+                30,  // suitably high default timeout, not expected to timeout
+                TimeUnit.SECONDS);
+        System.out.println(sb.toString()); // print the process' stdout/stderr
+        // the process has started and it is confirmed that the process output has the line
+        // we were waiting for. now kill the process.
+        p.destroy();
+        final int exitCode = p.waitFor();
+        if (!isNormalExitCode(exitCode)) {
+            throw new AssertionError("jwebserver exited with unexpected exit code: " + exitCode);
+        }
+        return sb.toString();
+    }
+
+    private static boolean isNormalExitCode(final int exitCode) {
+        final int SIGTERM = 15;
+        if (OperatingSystem.isWindows()) {
+            return exitCode == 1; // we expect exit code == 1 on Windows for Process.destroy()
+        } else {
+            // signal terminated exit code on Unix is 128 + signal value
+            return exitCode == (128 + SIGTERM);
+        }
+    }
+}
diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java
index 9ee5020fd9e83..89662c95252ce 100644
--- a/test/jdk/java/foreign/TestAccessModes.java
+++ b/test/jdk/java/foreign/TestAccessModes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,7 @@
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes
  */
 
-import java.lang.foreign.AddressLayout;
-import java.lang.foreign.Arena;
-import java.lang.foreign.MemoryLayout;
-import java.lang.foreign.MemorySegment;
-import java.lang.foreign.ValueLayout;
+import java.lang.foreign.*;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -50,10 +46,12 @@
 public class TestAccessModes {
 
     @Test(dataProvider = "segmentsAndLayoutsAndModes")
-    public void testAccessModes(MemorySegment segment, ValueLayout layout, AccessMode mode) throws Throwable {
-        VarHandle varHandle = layout.varHandle();
+    public void testAccessModes(MemorySegment segment, MemoryLayout layout, AccessMode mode) throws Throwable {
+        VarHandle varHandle = layout instanceof ValueLayout ?
+                layout.varHandle() :
+                layout.varHandle(MemoryLayout.PathElement.groupElement(0));
         MethodHandle methodHandle = varHandle.toMethodHandle(mode);
-        boolean compatible = AccessModeKind.supportedModes(layout).contains(AccessModeKind.of(mode));
+        boolean compatible = AccessModeKind.supportedModes(accessLayout(layout)).contains(AccessModeKind.of(mode));
         try {
             Object o = methodHandle.invokeWithArguments(makeArgs(segment, varHandle.accessModeType(mode)));
             assertTrue(compatible);
@@ -61,10 +59,19 @@ public void testAccessModes(MemorySegment segment, ValueLayout layout, AccessMod
             assertFalse(compatible);
         } catch (IllegalArgumentException ex) {
             // access is unaligned, but access mode is supported
-            assertTrue(compatible);
+            assertTrue(compatible ||
+                    (layout instanceof GroupLayout && segment.maxByteAlignment() < layout.byteAlignment()));
         }
     }
 
+    static ValueLayout accessLayout(MemoryLayout layout) {
+        return switch (layout) {
+            case ValueLayout vl -> vl;
+            case GroupLayout gl -> accessLayout(gl.memberLayouts().get(0));
+            default -> throw new IllegalStateException();
+        };
+    }
+
     Object[] makeArgs(MemorySegment segment, MethodType type) throws Throwable {
         List<Object> args = new ArrayList<>();
         args.add(segment);
@@ -145,6 +152,7 @@ static MemoryLayout[] layouts() {
         for (MemoryLayout layout : valueLayouts) {
             for (int align : new int[] { 1, 2, 4, 8 }) {
                 layouts.add(layout.withByteAlignment(align));
+                layouts.add(MemoryLayout.structLayout(layout.withByteAlignment(align)));
             }
         }
         return layouts.toArray(new MemoryLayout[0]);
diff --git a/test/jdk/java/io/Console/ConsolePromptTest.java b/test/jdk/java/io/Console/ConsolePromptTest.java
new file mode 100644
index 0000000000000..3cab25b5a1ca3
--- /dev/null
+++ b/test/jdk/java/io/Console/ConsolePromptTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8331681
+ * @summary Verify the java.base's console provider handles the prompt correctly.
+ * @library /test/lib
+ * @run main/othervm --limit-modules java.base ConsolePromptTest
+ * @run main/othervm -Djdk.console=java.base ConsolePromptTest
+ */
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class ConsolePromptTest {
+
+    public static void main(String... args) throws Throwable {
+        for (Method m : ConsolePromptTest.class.getDeclaredMethods()) {
+            if (m.getName().startsWith("test")) {
+                m.invoke(new ConsolePromptTest());
+            }
+        }
+    }
+
+    void testCorrectOutputReadLine() throws Exception {
+        doRunConsoleTest("testCorrectOutputReadLine", "inp", "%s");
+    }
+
+    void testCorrectOutputReadPassword() throws Exception {
+        doRunConsoleTest("testCorrectOutputReadPassword", "inp", "%s");
+    }
+
+    void doRunConsoleTest(String testName,
+                          String input,
+                          String expectedOut) throws Exception {
+        ProcessBuilder builder =
+                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName(),
+                                                          testName);
+        OutputAnalyzer output = ProcessTools.executeProcess(builder, input);
+
+        output.waitFor();
+
+        if (output.getExitValue() != 0) {
+            throw new AssertionError("Unexpected return value: " + output.getExitValue() +
+                                     ", actualOut: " + output.getStdout() +
+                                     ", actualErr: " + output.getStderr());
+        }
+
+        String actualOut = output.getStdout();
+
+        if (!Objects.equals(expectedOut, actualOut)) {
+            throw new AssertionError("Unexpected stdout content. " +
+                                     "Expected: '" + expectedOut + "'" +
+                                     ", got: '" + actualOut + "'");
+        }
+
+        String expectedErr = "";
+        String actualErr = output.getStderr();
+
+        if (!Objects.equals(expectedErr, actualErr)) {
+            throw new AssertionError("Unexpected stderr content. " +
+                                     "Expected: '" + expectedErr + "'" +
+                                     ", got: '" + actualErr + "'");
+        }
+    }
+
+    public static class ConsoleTest {
+        public static void main(String... args) {
+            switch (args[0]) {
+                case "testCorrectOutputReadLine" ->
+                    System.console().readLine("%%s");
+                case "testCorrectOutputReadPassword" ->
+                    System.console().readPassword("%%s");
+                default -> throw new UnsupportedOperationException(args[0]);
+            }
+
+            System.exit(0);
+        }
+    }
+}
diff --git a/test/jdk/java/net/Authenticator/B4769350.java b/test/jdk/java/net/Authenticator/B4769350.java
index aba41d222ea8e..813bf02de93c5 100644
--- a/test/jdk/java/net/Authenticator/B4769350.java
+++ b/test/jdk/java/net/Authenticator/B4769350.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -355,7 +355,7 @@ static void proxyReply (HttpExchange exchange, String reply)
                 throws IOException
         {
             exchange.getResponseHeaders().add("Proxy-Authenticate", reply);
-            exchange.sendResponseHeaders(407, 0);
+            exchange.sendResponseHeaders(407, -1);
         }
 
         static void okReply (HttpExchange exchange) throws IOException {
diff --git a/test/jdk/java/util/Calendar/CalendarLeapYearAddTest.java b/test/jdk/java/util/Calendar/CalendarLeapYearAddTest.java
new file mode 100644
index 0000000000000..13b2856ed5788
--- /dev/null
+++ b/test/jdk/java/util/Calendar/CalendarLeapYearAddTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8331646
+ * @summary confirm that Calendar.add() works correctly with leap year calculations
+ * @run junit CalendarLeapYearAddTest
+ */
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import static java.util.Calendar.APRIL;
+import static java.util.Calendar.DATE;
+import static java.util.Calendar.DAY_OF_MONTH;
+import static java.util.Calendar.DAY_OF_WEEK;
+import static java.util.Calendar.DAY_OF_WEEK_IN_MONTH;
+import static java.util.Calendar.DAY_OF_YEAR;
+import static java.util.Calendar.FEBRUARY;
+import static java.util.Calendar.LONG;
+import static java.util.Calendar.MARCH;
+import static java.util.Calendar.MONTH;
+import static java.util.Calendar.WEEK_OF_YEAR;
+import static java.util.Calendar.YEAR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CalendarLeapYearAddTest {
+
+    /**
+     * 8331646 Calendar add for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarAddSource")
+    public void testAddLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                int value, int calendarField, int expectedDate, int expectedMonth,
+                                int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.add(calendarField, value);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+    }
+
+    /**
+     * 8331646 Calendar month and year add/subtract for leap/non-leap year
+     */
+    @Test
+    public void testMonthYearAddSubtractNonLeapYear() {
+        Calendar calendar = new GregorianCalendar(2024, FEBRUARY, 29);
+        calendar.add(MONTH, 1);
+        calendar.add(YEAR, -1);
+        calendar.add(MONTH, -1);
+        /* When month added date jumps to 29th of March 2024, after year subtracted date jumps to 29th of March 2023
+           after month subtracted date jumps to 28th of Feb 2023 as non leap year
+         */
+        assertEquals(28, calendar.get(DATE),
+                "testMonthYearAddSubtractNonLeapYear Expected 28th of February 2024 but got " + calendar.getTime());
+        assertEquals(FEBRUARY, calendar.get(MONTH),
+                " testMonthYearAddSubtractNonLeapYear Expected February but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+    }
+
+    /**
+     * 8331646 Calendar add/subtract for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarAddSubtractSource")
+    public void testAddSubtractLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                        int firstValue, int secondValue, int calendarField, int expectedDate,
+                                        int expectedMonth, int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.add(calendarField, firstValue);
+        calendar.add(calendarField, secondValue);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+    }
+
+    private static Stream<Arguments> calendarAddSubtractSource() {
+        return Stream.of(
+                Arguments.of("testMonthAddSubtractLeapYearReversed", 31, MARCH, 2024, -1, 1, MONTH, 29, MARCH, 2024),
+                Arguments.of("testMonthAddSubtractLeapYear", 29, FEBRUARY, 2024, 1, -1, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testYearAddSubtractLeapYear", 29, FEBRUARY, 2024, 1, -1, YEAR, 28, FEBRUARY, 2024),
+                Arguments.of("testDayOfYearAddSubtractLeapYear", 29, FEBRUARY, 2024, 365, -365, DAY_OF_YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDateAddSubtractLeapYear", 29, FEBRUARY, 2024, 365, -365, DATE, 29, FEBRUARY, 2024),
+                Arguments.of("testWeekOfYearAddSubtractLeapYear", 29, FEBRUARY, 2024, 52, -52, WEEK_OF_YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfMonthAddSubtractLeapYear", 29, FEBRUARY, 2024, 31, -31, DAY_OF_MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekInMonthAddSubtractLeapYear", 29, FEBRUARY, 2024, 6, -6, DAY_OF_WEEK_IN_MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekAddSubtractLeapYear", 29, FEBRUARY, 2024, 6, -6, DAY_OF_WEEK, 29, FEBRUARY, 2024)
+        );
+    }
+
+    private static Stream<Arguments> calendarAddSource() {
+        return Stream.of(
+                Arguments.of("testMonthAddLeapYear", 29, FEBRUARY, 2024, 1, MONTH, 29, MARCH, 2024),
+                Arguments.of("testOneMonthSubtractLeapYear", 31, MARCH, 2024, -1, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testTwoMonthSubtractLeapYear", 30, APRIL, 2024, -2, MONTH, 29, FEBRUARY, 2024)
+        );
+    }
+}
diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java
index d3b0d254c4156..1a281885b3169 100644
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -605,6 +605,27 @@ public void testDoubleParSpliterators(String name, TestData.OfDouble data) {
         }
     }
 
+    @Test
+    public void testCharacteristicsForSortedUnorderedStreamSpliterators() {
+        assertValidCombinationOfSortedAndOrdered(
+            DoubleStream.of(3d,2d,4d,1d,5d).sorted().unordered().spliterator()
+        );
+        assertValidCombinationOfSortedAndOrdered(
+            IntStream.of(3,2,4,1,5).sorted().unordered().spliterator()
+        );
+        assertValidCombinationOfSortedAndOrdered(
+            LongStream.of(3L,2L,4L,1L,5L).sorted().unordered().spliterator()
+        );
+        assertValidCombinationOfSortedAndOrdered(
+            Stream.of(3,2,4,1,5).sorted().unordered().spliterator()
+        );
+    }
+
+    void assertValidCombinationOfSortedAndOrdered(Spliterator<?> s) {
+        if (s.hasCharacteristics(Spliterator.SORTED))
+            Assert.assertTrue(s.hasCharacteristics(Spliterator.ORDERED));
+    }
+
     private List<Function<DoubleStream, DoubleStream>> doubleStreamFunctions;
 
     List<Function<DoubleStream, DoubleStream>> doubleStreamFunctions() {
diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
index 3515ca9c2fff1..b67f897830473 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -273,7 +273,7 @@ protected void doClientSide() throws Exception {
                 configureClientSocket(sslSocket);
                 InetAddress serverAddress = this.serverAddress;
                 InetSocketAddress connectAddress = serverAddress == null
-                        ? new InetSocketAddress("localhost", serverPort)
+                        ? new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort)
                         : new InetSocketAddress(serverAddress, serverPort);
                 sslSocket.connect(connectAddress, 15000);
             } catch (IOException ioe) {
diff --git a/test/jdk/javax/net/ssl/templates/TLSBase.java b/test/jdk/javax/net/ssl/templates/TLSBase.java
index 414e7e106b327..812aea09fea11 100644
--- a/test/jdk/javax/net/ssl/templates/TLSBase.java
+++ b/test/jdk/javax/net/ssl/templates/TLSBase.java
@@ -23,6 +23,7 @@
 
 import javax.net.ssl.*;
 import java.io.*;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.security.KeyStore;
 import java.security.cert.PKIXBuilderParameters;
@@ -334,7 +335,7 @@ public SSLSocket connect() {
                 sslContext = SSLContext.getInstance("TLS");
                 sslContext.init(TLSBase.getKeyManager(km), TLSBase.getTrustManager(tm), null);
                 sock = (SSLSocket)sslContext.getSocketFactory().createSocket();
-                sock.connect(new InetSocketAddress("localhost", serverPort));
+                sock.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort));
                 System.err.println("Client connected using port " +
                         sock.getLocalPort());
                 name = "client(" + sock.toString() + ")";
diff --git a/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java b/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java
new file mode 100644
index 0000000000000..360845ccb64fe
--- /dev/null
+++ b/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.GridLayout;
+import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+/*
+ * @test
+ * @bug 4690946 8226990 6462396
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @requires (os.family == "windows" | os.family == "linux")
+ * @summary Test JTabbedPane's contentarea, tab area and tab color
+ *          for different LAFs when opacity is enabled or disabled.
+ * @run main/manual TestJTabbedPaneOpaqueColor
+ */
+
+public class TestJTabbedPaneOpaqueColor {
+    private static JFrame frame;
+    private static JTabbedPane tabPane;
+    private static final String INSTRUCTIONS = """
+            The background color of panel which contains the tabbed pane is green.
+            The background color of the tabbed pane is red.
+            The TabbedPane is not opaque initially.
+            For 'Content Opaque' and 'Tabs Opaque' to have effect, tab pane opacity should
+            be set to false i.e. Opaque checkbox should be unchecked.
+            NOTE: For Nimbus LAF, tabs color are specific to nimbus style.
+
+            Check the default behaviour of the tabbed pane:
+              - the area behind tabs is transparent (it must be green).
+              - the tabs area is opaque (it must be red, except the selected tab which must be gray).
+              - the content area is opaque (it must be gray).
+
+            Test Case 1 - Test TabPane Opacity:
+            NOTE: For Nimbus LAF, tabs color are always gray in color.
+
+            Verify the following with 'opaque' option:
+            when checked:
+              - the area behind tabs is opaque (it must be red).
+              - the tabs area is opaque (it must be red, except the selected tab which must be gray).
+              - the content area is opaque (it must be gray).
+            when unchecked:
+              - the area behind tabs is transparent (it must be green).
+              - the tabs area is opaque (it must be red, except the selected tab which must be gray).
+              - the content area is opaque (it must be gray).
+
+            Check this behaviour by clicking on present L&F button and tab layout.
+
+            Test Case 2 - Test Content pane opacity:
+            To test Content pane opacity, make sure "Opaque checkbox" is UNCHECKED.
+
+            Verify the following with 'content opaque' option:
+            when checked:
+              - the content area should be opaque (it must be gray).
+            when unchecked:
+              - the content area should be transparent (it must be green).
+
+            Check this behaviour by clicking on present L&F button and tab layout.
+
+            Test Case 3 - Test Tabs opacity:
+            To test Tabs opacity, make sure "Opaque checkbox" is UNCHECKED.
+            NOTE: For Nimbus LAF, tabs color are specific to nimbus style.
+                  All tabs are gray in color if tabs opaque is checked.
+
+            Verify the following with 'tabs opaque' option:
+            when checked:
+              - the tabs are opaque (it must be red, except the selected tab which must be gray).
+            when unchecked:
+              - the tabs are transparent (it must be green).
+
+            Check this behaviour by clicking on present L&F button and tab layout.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+            .title("JTabbedPane Tab and Content Area Color Test Instructions")
+            .instructions(INSTRUCTIONS)
+            .testTimeOut(10)
+            .rows(25)
+            .columns(60)
+            .testUI(TestJTabbedPaneOpaqueColor::createAndShowUI)
+            .build()
+            .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        int NUM_TABS = 15;
+        frame = new JFrame("Test JTabbedPane Opaque Color");
+        JTabbedPane tabPane = new JTabbedPane();
+        tabPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+        tabPane.setTabPlacement(JTabbedPane.TOP);
+        PassFailJFrame.positionTestWindow(
+                frame, PassFailJFrame.Position.HORIZONTAL);
+        for (int i = 0; i < NUM_TABS; ++i) {
+            tabPane.addTab("Tab " + i , new JLabel("Content Area"));
+        }
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(tabPane, BorderLayout.CENTER);
+        panel.setBackground(Color.green);
+        tabPane.setBackground(Color.red);
+
+        UIManager.LookAndFeelInfo[] laf = UIManager.getInstalledLookAndFeels();
+        JPanel lafButtonPanel = new JPanel(new GridLayout(1, 3));
+        for (int i = 0; i < laf.length; ++i) {
+            if (laf[i].getName().contains("Motif")
+                || laf[i].getName().contains("Windows")) {
+                continue;
+            }
+            JButton button = new JButton(laf[i].getName());
+            button.setText(laf[i].getName());
+            button.addActionListener(new MyAction());
+            lafButtonPanel.add(button);
+        }
+
+        JButton scrollButton = new JButton(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                tabPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+            }
+        });
+        scrollButton.setText("SCROLL layout");
+
+        JPanel layoutButtonPanel = new JPanel(new GridLayout(1, 2));
+        JButton wrapButton = new JButton(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                tabPane.setTabLayoutPolicy(JTabbedPane.WRAP_TAB_LAYOUT);
+            }
+        });
+        wrapButton.setText("WRAP layout");
+
+        layoutButtonPanel.add(scrollButton);
+        layoutButtonPanel.add(wrapButton);
+
+        JCheckBox contentOpaqueChkBox = new JCheckBox(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                if (((AbstractButton)e.getSource()).isSelected()) {
+                    UIManager.put("TabbedPane.contentOpaque", Boolean.TRUE);
+                } else {
+                    UIManager.put("TabbedPane.contentOpaque", Boolean.FALSE);
+                }
+                tabPane.repaint();
+                SwingUtilities.updateComponentTreeUI(frame);
+            }
+        });
+        contentOpaqueChkBox.setText("Content Opaque");
+        contentOpaqueChkBox.setSelected(true);
+        contentOpaqueChkBox.setEnabled(true);
+
+        JCheckBox tabOpaqueChkBox = new JCheckBox(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                if (((AbstractButton)e.getSource()).isSelected()) {
+                    UIManager.put("TabbedPane.tabsOpaque", Boolean.TRUE);
+                } else {
+                    UIManager.put("TabbedPane.tabsOpaque", Boolean.FALSE);
+                }
+                tabPane.repaint();
+                SwingUtilities.updateComponentTreeUI(frame);
+            }
+        });
+        tabOpaqueChkBox.setText("Tabs Opaque");
+        tabOpaqueChkBox.setSelected(true);
+        tabOpaqueChkBox.setEnabled(true);
+
+        JCheckBox tabPaneOpaqueChkBox = new JCheckBox(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                tabPane.setOpaque(((AbstractButton)e.getSource()).isSelected());
+                contentOpaqueChkBox.setEnabled(!((AbstractButton)e.getSource()).isSelected());
+                tabOpaqueChkBox.setEnabled(!((AbstractButton)e.getSource()).isSelected());
+                tabPane.repaint();
+                SwingUtilities.updateComponentTreeUI(frame);
+            }
+        });
+        tabPaneOpaqueChkBox.setText("Opaque");
+
+        JPanel checkBoxPanel = new JPanel();
+        checkBoxPanel.add(tabPaneOpaqueChkBox);
+        checkBoxPanel.add(contentOpaqueChkBox);
+        checkBoxPanel.add(tabOpaqueChkBox);
+
+        JPanel nestedPanels = new JPanel(new GridLayout(2, 1));
+        nestedPanels.add(lafButtonPanel);
+        nestedPanels.add(layoutButtonPanel);
+        panel.add(checkBoxPanel, BorderLayout.NORTH);
+        panel.add(nestedPanels, BorderLayout.SOUTH);
+        frame.add(panel);
+        frame.setSize(500, 500);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+        return frame;
+    }
+
+    public static class MyAction implements ActionListener {
+        public void actionPerformed(ActionEvent ae) {
+            String lafClassName = null;
+            UIManager.LookAndFeelInfo lafs[] = UIManager.getInstalledLookAndFeels();
+            for (int i = 0; i < lafs.length; i++) {
+                if (ae.getActionCommand().equals(lafs[i].getName())) {
+                    lafClassName = lafs[i].getClassName();
+                    break;
+                }
+            }
+            try {
+                UIManager.setLookAndFeel(lafClassName);
+                if (frame != null) {
+                    frame.dispose();
+                }
+                createAndShowUI();
+            } catch (UnsupportedLookAndFeelException ignored) {
+                System.out.println("Unsupported LAF: " + lafClassName);
+            } catch (ClassNotFoundException | InstantiationException
+                     | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/KeyBoardNavigation.java b/test/jdk/javax/swing/JTable/KeyBoardNavigation.java
index 4a75b8c68d70f..595547421ad16 100644
--- a/test/jdk/javax/swing/JTable/KeyBoardNavigation.java
+++ b/test/jdk/javax/swing/JTable/KeyBoardNavigation.java
@@ -30,11 +30,9 @@
 import javax.swing.JLabel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.SwingUtilities;
 import javax.swing.border.BevelBorder;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 
@@ -49,52 +47,7 @@
  */
 
 public class KeyBoardNavigation {
-    static JFrame frame;
-    public static PassFailJFrame passFailJFrame;
-
-    static void initTest() throws Exception {
-        final String INSTRUCTIONS = """
-                Instructions to Test:
-                1. Refer the below keyboard navigation specs
-                 (referenced from bug report 4112270).
-                2. Check all combinations of navigational keys in all four modes
-                  shift and control verifying each change to the selection against
-                  the spec. If it does, press "pass", otherwise press "fail".
-
-                  Navigate In - Tab, shift-tab, control-tab, shift-control-tab
-                  Return/shift-return - move focus one cell down/up.
-                  Tab/shift-tab - move focus one cell right/left.
-                  Up/down arrow - deselect current selection; move focus one cell up/down
-                  Left/right arrow - deselect current selection; move focus one cell
-                                             left/right
-                  PageUp/PageDown - deselect current selection; scroll up/down one
-                                    JViewport view; first visible cell in current
-                                    column gets focus
-                  Control-PageUp/PageDown - deselect current selection; scroll
-                                            left/right one JViewport view; first
-                                            visible cell in current row gets
-                                            focus
-                  Home/end - deselect current selection; move focus and view to
-                                     first/last cell in current row
-                  Control-home/end - deselect current selection; move focus and view to
-                                             upper-left/lower-right cell in table
-                  F2 - Allows editing in a cell containing information without
-                               overwriting the information
-                  Esc - Resets the cell content back to the state it was in before
-                                editing started
-                  Ctrl+A, Ctrl+/ = Select all
-                  Ctrl+\\ = De-select all
-                  Shift-up/down arrow - extend selection up/down one row
-                  Shift-left/right arrow - extend selection left/right one column
-                  Control-shift up/down arrow - extend selection to top/bottom of column
-                  Shift-home/end - extend selection to left/right end of row
-                  Control-shift-home/end - extend selection to beginning/end of data
-                  Shift-PageUp/PageDown - extend selection up/down one view and scroll
-                                          table
-                  Control-shift-PageUp/PageDown - extend selection left/right one view
-                                                          and scroll table
-                """;
-
+    static JFrame initTest() {
         final String[] names = {"First Name", "Last Name", "Favorite Color",
                 "Favorite Number", "Vegetarian"};
         final Object[][] data = {
@@ -121,12 +74,7 @@ static void initTest() throws Exception {
                 {"Arnaud", "Weber", "Green", 44, Boolean.FALSE}
         };
 
-        frame = new JFrame("JTable Keyboard Navigation Test");
-        passFailJFrame = new PassFailJFrame("Test Instructions",
-                INSTRUCTIONS, 5L, 15, 50);
-
-        PassFailJFrame.addTestWindow(frame);
-        PassFailJFrame.positionTestWindow(frame, PassFailJFrame.Position.VERTICAL);
+        JFrame frame = new JFrame("JTable Keyboard Navigation Test");
 
         JTable tableView = getTableDetails(names, data);
 
@@ -151,9 +99,9 @@ static void initTest() throws Exception {
         colorColumn.setCellRenderer(colorColumnRenderer);
 
         // Set a tooltip for the header of the colors column.
-        TableCellRenderer headerRenderer = colorColumn.getHeaderRenderer();
-        if (headerRenderer instanceof DefaultTableCellRenderer)
-            ((DefaultTableCellRenderer) headerRenderer).setToolTipText("Hi Mom!");
+        if (colorColumn.getHeaderRenderer() instanceof DefaultTableCellRenderer headerRenderer) {
+            headerRenderer.setToolTipText("Hi Mom!");
+        }
 
         // Set the width of the "Vegetarian" column.
         TableColumn vegetarianColumn = tableView.getColumn("Vegetarian");
@@ -163,7 +111,7 @@ static void initTest() throws Exception {
         TableColumn numbersColumn = tableView.getColumn("Favorite Number");
         DefaultTableCellRenderer numberColumnRenderer = new DefaultTableCellRenderer() {
             public void setValue(Object value) {
-                int cellValue = (value instanceof Number) ? ((Number) value).intValue() : 0;
+                int cellValue = (value instanceof Number number) ? number.intValue() : 0;
                 setForeground((cellValue > 30) ? Color.black : Color.red);
                 setText((value == null) ? "" : value.toString());
             }
@@ -172,13 +120,14 @@ public void setValue(Object value) {
         numbersColumn.setCellRenderer(numberColumnRenderer);
         numbersColumn.setPreferredWidth(110);
 
+        tableView.setColumnSelectionAllowed(true);
         JScrollPane scrollPane = new JScrollPane(tableView);
         scrollPane.setBorder(new BevelBorder(BevelBorder.LOWERED));
         scrollPane.setPreferredSize(new Dimension(430, 200));
 
         frame.add(scrollPane);
         frame.pack();
-        frame.setVisible(true);
+        return frame;
     }
 
     private static JTable getTableDetails(String[] names, Object[][] data) {
@@ -224,13 +173,128 @@ public void setValueAt(Object aValue, int row, int column) {
     }
 
     public static void main(String[] args) throws Exception {
-        SwingUtilities.invokeAndWait(() -> {
-            try {
-                initTest();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-        passFailJFrame.awaitAndCheck();
+        String INSTRUCTIONS = """
+                Instructions to Test:
+                1. Refer the below keyboard navigation specs
+                 (referenced from bug report 4112270).
+                2. Check all combinations of navigational keys mentioned below
+                 and verifying each key combinations against the spec defined.
+                 If it does, press "pass", otherwise press "fail".
+
+                """;
+
+        INSTRUCTIONS += getOSSpecificInstructions();
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .rows(30)
+                .columns(50)
+                .testUI(KeyBoardNavigation::initTest)
+                .testTimeOut(10)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static String getOSSpecificInstructions() {
+        final String WINDOWS_SPECIFIC = """
+                Tab, Shift-Tab - Navigate In.
+                Return/Shift-Return - Move focus one cell down/up.
+                Tab/Shift-Tab -  Move focus one cell right/left.
+                Up/Down Arrow - Deselect current selection; move focus one
+                                cell up/down
+                Left/Right Arrow - Deselect current selection; move focus
+                                   one cell left/right
+                PageUp/PageDown - Deselect current selection; scroll up/down
+                                  one JViewport view; first visible cell in
+                                  current column gets focus
+                Control-PageUp/PageDown - Deselect current selection;
+                                          move focus and view to
+                                          first/last cell in current row
+                Home/End - Deselect current selection; move focus and view to
+                           first/last cell in current row
+                Control-Home/End - Deselect current selection;
+                                   scroll up/down one  JViewport view;
+                                   first/last visible row of the table
+                F2 - Allows editing in a cell containing information without
+                     overwriting the information
+                Esc -  Resets the cell content back to the state it was in
+                       before editing started
+                Ctrl+A, Ctrl+/ - Select All
+                Ctrl+\\ - Deselect all
+                Shift-Up/Down Arrow -  Extend selection up/down one row
+                Shift-Left/Right Arrow - Extend selection left/right one
+                                         column
+                Control-shift Up/Down Arrow -  Extend selection to top/bottom
+                                                of column
+                Shift-Home/End -  Extend selection to left/right end of row
+                Control-Shift-Home/End  - Extend selection to beginning/end
+                                          of data
+                Shift-PageUp/PageDown - Extend selection up/down one view
+                                        and scroll table
+                Control-Shift-PageUp/PageDown - Extend selection left/right
+                                                end of row
+                """;
+
+        final String LINUX_SPECIFIC = """
+                Tab, Shift-Tab - Navigate In.
+                Return/Shift-Return - Move focus one cell down/up.
+                Tab/Shift-Tab -  Move focus one cell right/left.
+                Up/Down Arrow - Deselect current selection;
+                                move focus one cell up/down
+                Left/Right Arrow - Deselect current selection;
+                                   move focus one cell left/right
+                PageUp/PageDown - Deselect current selection;
+                                  scroll up/down one  JViewport view;
+                                  first visible cell in current column gets focus
+                Home/End - Deselect current selection; move focus and view to
+                                     first/last cell in current row
+                F2 - Allows editing in a cell containing information without
+                     overwriting the information
+                Esc -  Resets the cell content back to the state it was in
+                       before editing started
+                Ctrl+A, Ctrl+/ - Select All
+                Ctrl+\\ - Deselect all
+                Shift-Up/Down Arrow -  Extend selection up/down one row
+                Shift-Left/Right Arrow - Extend selection left/right one column
+                Control-Shift Up/Down Arrow -  Extend selection to top/bottom of
+                                               column
+                Shift-Home/End -  Extend selection to left/right end of row
+                Shift-PageUp/PageDown - Extend selection up/down one view and
+                                        scroll  table
+                """;
+
+        final String MAC_SPECIFIC = """
+                Tab, Shift-Tab - Navigate In.
+                Return/Shift-Return - Move focus one cell down/up.
+                Tab/Shift-Tab -  Move focus one cell right/left.
+                Up/Down Arrow - Deselect current selection; move focus one cell
+                                up/down
+                Left/Right Arrow - Deselect current selection;
+                                   move focus one cell left/right
+                FN+Up Arrow/FN+Down Arrow - Deselect current selection;
+                                   scroll up/down one JViewport view;
+                                   first visible cell in current column gets focus
+                Control-FN+Up Arrow/FN+Down Arrow - Deselect current selection;
+                                                    move focus and view to
+                                                    first/last cell in current row
+                F2 - Allows editing in a cell containing information without
+                     overwriting the information
+                Esc -  Resets the cell content back to the state it was in
+                       before editing started
+                Ctrl+A, Ctrl+/ - Select All
+                Ctrl+\\ - Deselect all
+                Shift-Up/Down Arrow -  Extend selection up/down one row
+                Shift-Left/Right Arrow - Extend selection left/right one column
+                FN-Shift Up/Down Arrow -  Extend selection to top/bottom of column
+                Shift-PageUp/PageDown - Extend selection up/down one view and scroll
+                                        table
+                                """;
+        String osName = System.getProperty("os.name").toLowerCase();
+        if (osName.startsWith("mac")) {
+            return MAC_SPECIFIC;
+        } else if (osName.startsWith("win")) {
+            return WINDOWS_SPECIFIC;
+        } else {
+            return LINUX_SPECIFIC;
+        }
     }
 }
diff --git a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
index 689aca5bbdb1e..770c8f92b2656 100644
--- a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
+++ b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
@@ -164,7 +164,7 @@ private static void runTest(final long timeStart) throws Throwable {
             System.out.println("  = 1: " + ones);
             System.out.println("  = 2: " + twos);
             System.out.println("  > 2: " + count);
-            if (count > 0) {
+            if (count > loaderCount.size() / 2) {
                 throw new RuntimeException("Detected " + count + " snapshots "
                                            + "with several loading threads");
             }
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong.java b/test/jdk/jdk/classfile/TypeKindTest.java
similarity index 51%
rename from src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong.java
rename to test/jdk/jdk/classfile/TypeKindTest.java
index 7d9ab39bc33ca..19ef0b27150a6 100644
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong.java
+++ b/test/jdk/jdk/classfile/TypeKindTest.java
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
+ * published by the Free Software Foundation.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -22,22 +20,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.internal.org.jline.terminal.impl.jna.osx;
 
-class NativeLong {
+/*
+ * @test
+ * @summary Testing TypeKind.
+ * @bug 8331744
+ * @run junit TypeKindTest
+ */
+import org.junit.jupiter.api.Test;
 
-    public long value;
+import java.lang.classfile.TypeKind;
 
-    public NativeLong(long value) {
-        this.value = value;
-    }
+import static org.junit.Assert.assertThrows;
 
-    public void setValue(long value) {
-        this.value = value;
-    }
+class TypeKindTest {
+    @Test
+    void testContracts() {
+        assertThrows(NullPointerException.class, () -> TypeKind.from(null));
 
-    public long longValue() {
-        return value;
-    }
+        assertThrows(NullPointerException.class, () -> TypeKind.fromDescriptor(null));
+        assertThrows(IllegalArgumentException.class, () -> TypeKind.fromDescriptor(""));
+        assertThrows(IllegalArgumentException.class, () -> TypeKind.fromDescriptor("int"));
 
+        assertThrows(IllegalArgumentException.class, () -> TypeKind.fromNewarrayCode(-1));
+        assertThrows(IllegalArgumentException.class, () -> TypeKind.fromNewarrayCode(21));
+    }
 }
diff --git a/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java b/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
index d53c9b20309db..1ca4c091d27ee 100644
--- a/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
+++ b/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
@@ -25,8 +25,10 @@
  * @test
  * @bug 8218287
  * @summary Verify the wrapper input stream is used when using Terminal.reader()
- * @modules jdk.internal.le/jdk.internal.org.jline.terminal
+ * @modules jdk.internal.le/jdk.internal.org.jline
+ *          jdk.internal.le/jdk.internal.org.jline.terminal
  *          jdk.internal.le/jdk.internal.org.jline.terminal.impl
+ *          jdk.internal.le/jdk.internal.org.jline.terminal.spi
  *          jdk.internal.le/jdk.internal.org.jline.utils
  */
 
@@ -39,6 +41,7 @@
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal.SignalHandler;
 import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 
 
 public class AbstractWindowsTerminalTest {
@@ -56,14 +59,17 @@ public int read() throws IOException {
                 return is.read();
             }
         };
-        var t = new AbstractWindowsTerminal(out, "test", "vt100", null, false, SignalHandler.SIG_DFL, isWrapper) {
+        var t = new AbstractWindowsTerminal<String>(null, SystemStream.Output, out,
+                                                    "test", "vt100", null, false,
+                                                    SignalHandler.SIG_DFL, "", 0,
+                                                    "", 0, isWrapper) {
             @Override
-            protected int getConsoleMode() {
+            protected int getConsoleMode(String console) {
                 return -1;
             }
 
             @Override
-            protected void setConsoleMode(int mode) {
+            protected void setConsoleMode(String console, int mode) {
                 throw new UnsupportedOperationException("unexpected.");
             }
 
diff --git a/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java b/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
new file mode 100644
index 0000000000000..5e69cdf4f4bfd
--- /dev/null
+++ b/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8331535
+ * @summary Verify the jdk.internal.le's console provider works properly.
+ * @modules jdk.internal.le
+ * @library /test/lib
+ * @run main/othervm -Djdk.console=jdk.internal.le JLineConsoleProviderTest
+ */
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class JLineConsoleProviderTest {
+
+    public static void main(String... args) throws Throwable {
+        for (Method m : JLineConsoleProviderTest.class.getDeclaredMethods()) {
+            if (m.getName().startsWith("test")) {
+                m.invoke(new JLineConsoleProviderTest());
+            }
+        }
+    }
+
+    void testCorrectOutputReadLine() throws Exception {
+        doRunConsoleTest("testCorrectOutputReadLine", "inp", "%s");
+    }
+
+    void testCorrectOutputReadPassword() throws Exception {
+        doRunConsoleTest("testCorrectOutputReadPassword", "inp", "%s");
+    }
+
+    void doRunConsoleTest(String testName,
+                          String input,
+                          String expectedOut) throws Exception {
+        ProcessBuilder builder =
+                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName(),
+                                                          testName);
+        OutputAnalyzer output = ProcessTools.executeProcess(builder, input);
+
+        output.waitFor();
+
+        if (output.getExitValue() != 0) {
+            throw new AssertionError("Unexpected return value: " + output.getExitValue() +
+                                     ", actualOut: " + output.getStdout() +
+                                     ", actualErr: " + output.getStderr());
+        }
+
+        String actualOut = output.getStdout();
+
+        if (!Objects.equals(expectedOut, actualOut)) {
+            throw new AssertionError("Unexpected stdout content. " +
+                                     "Expected: '" + expectedOut + "'" +
+                                     ", got: '" + actualOut + "'");
+        }
+
+        String expectedErr = "";
+        String actualErr = output.getStderr();
+
+        if (!Objects.equals(expectedErr, actualErr)) {
+            throw new AssertionError("Unexpected stderr content. " +
+                                     "Expected: '" + expectedErr + "'" +
+                                     ", got: '" + actualErr + "'");
+        }
+    }
+
+    public static class ConsoleTest {
+        public static void main(String... args) {
+            switch (args[0]) {
+                case "testCorrectOutputReadLine" ->
+                    System.console().readLine("%%s");
+                case "testCorrectOutputReadPassword" ->
+                    System.console().readPassword("%%s");
+                default -> throw new UnsupportedOperationException(args[0]);
+            }
+
+            System.exit(0);
+        }
+    }
+}
diff --git a/test/jdk/jdk/internal/jline/KeyConversionTest.java b/test/jdk/jdk/internal/jline/KeyConversionTest.java
index aed9a726715cf..ffd116dbbc263 100644
--- a/test/jdk/jdk/internal/jline/KeyConversionTest.java
+++ b/test/jdk/jdk/internal/jline/KeyConversionTest.java
@@ -27,6 +27,7 @@
  * @summary Verify the conversion from key events to escape sequences works properly.
  * @modules jdk.internal.le/jdk.internal.org.jline.terminal
  *          jdk.internal.le/jdk.internal.org.jline.terminal.impl
+ *          jdk.internal.le/jdk.internal.org.jline.terminal.spi
  */
 
 import java.io.IOException;
@@ -36,6 +37,7 @@
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal.SignalHandler;
 import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 
 public class KeyConversionTest {
     public static void main(String... args) throws Exception {
@@ -58,14 +60,17 @@ void run() throws Exception {
 
     void checkKeyConversion(KeyEvent event, String expected) throws IOException {
         StringBuilder result = new StringBuilder();
-        new AbstractWindowsTerminal(new StringWriter(), "", "windows", Charset.forName("UTF-8"),
-                                    true, SignalHandler.SIG_DFL, in -> in) {
+        new AbstractWindowsTerminal<String>(null, SystemStream.Output,
+                                            new StringWriter(), "", "windows",
+                                            Charset.forName("UTF-8"), true,
+                                            SignalHandler.SIG_DFL, "", 0,
+                                            "", 0, in -> in) {
             @Override
-            protected int getConsoleMode() {
+            protected int getConsoleMode(String console) {
                 return 0;
             }
             @Override
-            protected void setConsoleMode(int mode) {
+            protected void setConsoleMode(String console, int mode) {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
             @Override
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java b/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
index 2e6dbb84e2da6..0a6e7ef141622 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -244,6 +244,7 @@ static class NotFoundHandler implements HttpHandler {
         public void handle(HttpExchange t) throws IOException {
             t.sendResponseHeaders(404, 3);
             t.getResponseBody().write("abc".getBytes(StandardCharsets.UTF_8));
+            t.getResponseBody().close();
         }
     }
 }
diff --git a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
index 74045b533c295..904f672ba4016 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
+++ b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8228969 8244087 8255266 8302182
+ * @bug 8228969 8244087 8255266 8302182 8331864
  * @modules java.base/sun.security.util
  * @summary unit test for RegisteredDomain
  */
diff --git a/test/jdk/sun/security/util/RegisteredDomain/tests.dat b/test/jdk/sun/security/util/RegisteredDomain/tests.dat
index 280e66ff93bce..7fe95c979ea83 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/tests.dat
+++ b/test/jdk/sun/security/util/RegisteredDomain/tests.dat
@@ -161,6 +161,17 @@ site.ai.vn              ai.vn           site.ai.vn
 foo.السعودية            السعودية        foo.السعودية
 w.foo.السعودية          السعودية        foo.السعودية
 
+# newGTLDs
+
+# This is not a GTLD
+www.site.unknown        www.site.unknown    null
+
+# GTLD added in 1cbd6e7
+www.site.wed            wed                 site.wed
+
+# GTLD removed in 1cbd6e7
+www.site.oldnavy        www.site.oldnavy    null
+
 # Microsoft
 1.azurestaticapps.net         1.azurestaticapps.net       null
 app.1.azurestaticapps.net     1.azurestaticapps.net       app.1.azurestaticapps.net
diff --git a/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java b/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java
index 14f5a2be1671b..01797a6a82af9 100644
--- a/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java
+++ b/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -23,6 +23,8 @@
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 import jdk.test.lib.Utils;
 import jdk.test.lib.process.OutputAnalyzer;
@@ -31,7 +33,7 @@
 
 /*
  * @test
- * @bug 8222491 8273187
+ * @bug 8222491 8273187 8308033
  * @summary Tests if we handle the encoding of jcmd output correctly.
  * @library /test/lib
  * @run main JcmdOutputEncodingTest
@@ -52,12 +54,43 @@ private static void testThreadDump() throws Exception {
         launcher.addVMArg("-Dfile.encoding=" + cs);
         launcher.addVMArg("-Dsun.stdout.encoding=" + cs);
         launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
-        launcher.addToolArg("Thread.print");
+        boolean isVirtualThread = Thread.currentThread().isVirtual();
+        Path threadDumpFile = null;
+        if (isVirtualThread) {
+            // "jcmd Thread.print" will not print thread dumps of virtual threads.
+            // So we use "Thread.dump_to_file" command instead and dump the thread
+            // stacktraces in a file
+            threadDumpFile = Files.createTempFile(Path.of("."), "jcmd", ".tdump").toAbsolutePath();
+            launcher.addToolArg("Thread.dump_to_file");
+            launcher.addToolArg("-overwrite");
+            launcher.addToolArg(threadDumpFile.toString());
+        } else {
+            launcher.addToolArg("Thread.print");
+        }
 
         ProcessBuilder processBuilder = new ProcessBuilder();
         processBuilder.command(launcher.getCommand());
         OutputAnalyzer output = ProcessTools.executeProcess(processBuilder, null, cs);
         output.shouldHaveExitValue(0);
-        output.shouldContain(marker);
+        if (isVirtualThread) {
+            // verify the file containing the thread dump has the expected text
+            try (var br = Files.newBufferedReader(threadDumpFile, cs)) {
+                String line = null;
+                boolean found = false;
+                while ((line = br.readLine()) != null) {
+                    if (line.contains(marker)) {
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found) {
+                    output.reportDiagnosticSummary();
+                    throw new RuntimeException("'" + marker + "' missing in thread dump in file "
+                            + threadDumpFile);
+                }
+            }
+        } else {
+            output.shouldContain(marker);
+        }
     }
 }
diff --git a/test/jdk/sun/tools/jstack/BasicJStackTest.java b/test/jdk/sun/tools/jstack/BasicJStackTest.java
index e0a9c96d6ad2a..ec0a80e8d78cc 100644
--- a/test/jdk/sun/tools/jstack/BasicJStackTest.java
+++ b/test/jdk/sun/tools/jstack/BasicJStackTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,11 @@
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.JDKToolLauncher;
 
+import jtreg.SkippedException;
+
 /*
  * @test
- * @bug 8273187
+ * @bug 8273187 8308033
  * @summary Unit test for jstack utility
  * @library /test/lib
  * @run main BasicJStackTest
@@ -42,6 +44,13 @@ public class BasicJStackTest {
     private static ProcessBuilder processBuilder = new ProcessBuilder();
 
     public static void main(String[] args) throws Exception {
+        if (Thread.currentThread().isVirtual()) {
+            // This test runs jstack against the current process and then asserts the
+            // presence of current thread in the stacktraces. We skip this test
+            // when the current thread is a virtual thread since "jstack" command doesn't
+            // print the stacktraces of virtual threads.
+            throw new SkippedException("skipping test since current thread is a virtual thread");
+        }
         testJstackNoArgs();
         testJstack_l();
         testJstackUTF8Encoding();
diff --git a/test/jdk/sun/util/locale/provider/NonLikelyScriptTest.java b/test/jdk/sun/util/locale/provider/NonLikelyScriptTest.java
new file mode 100644
index 0000000000000..dbbfaf6f0054b
--- /dev/null
+++ b/test/jdk/sun/util/locale/provider/NonLikelyScriptTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8329691
+ * @modules java.base/sun.util.locale.provider
+ *          java.base/sun.util.cldr
+ * @summary Tests CLDR's `nonlikelyScript` attribute is correctly implemented
+ *      with the CLDRLocaleProviderAdapter
+ * @run junit NonLikelyScriptTest
+ */
+
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import sun.util.cldr.CLDRLocaleProviderAdapter;
+import sun.util.locale.provider.LocaleProviderAdapter;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class NonLikelyScriptTest {
+    private static final CLDRLocaleProviderAdapter CLDR_LOCALE_PROVIDER_ADAPTER
+        = (CLDRLocaleProviderAdapter) LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR);
+    private static final Locale AZ_ARAB = Locale.forLanguageTag("az-Arab");
+    private static final Locale AZ_CYRL = Locale.forLanguageTag("az-Cyrl");
+    private static final Locale AZ_LATN = Locale.forLanguageTag("az-Latn");
+    private static final Locale AZ_XXXX = Locale.forLanguageTag("az-Xxxx");
+    private static final Locale RU_LATN = Locale.forLanguageTag("ru-Latn");
+    private static final Locale RU_CYRL = Locale.forLanguageTag("ru-Cyrl");
+    private static final Locale RU_XXXX = Locale.forLanguageTag("ru-Xxxx");
+    private static final Locale EN_LATN = Locale.forLanguageTag("en-Latn");
+    private static final Locale EN_DSRT = Locale.forLanguageTag("en-Dsrt");
+    private static final Locale EN_XXXX = Locale.forLanguageTag("en-Xxxx");
+    private static final Locale ZH_HANT_MO = Locale.forLanguageTag("zh-Hant-MO");
+    private static final Locale ZH_HANS_SG = Locale.forLanguageTag("zh-Hans-SG");
+    private static final Locale ZH_HANS = Locale.forLanguageTag("zh-Hans");
+    private static final Locale ZH_HANT = Locale.forLanguageTag("zh-Hant");
+    private static final Locale ZH_XXXX = Locale.forLanguageTag("zh-Xxxx");
+
+    private static Stream<Arguments> parentLocales() {
+
+        return Stream.of(
+            // likely script
+            Arguments.of(AZ_LATN, List.of(AZ_LATN, Locale.of("az"), Locale.ROOT)),
+            Arguments.of(RU_CYRL, List.of(RU_CYRL, Locale.of("ru"), Locale.ROOT)),
+            Arguments.of(EN_LATN, List.of(EN_LATN, Locale.ENGLISH, Locale.ROOT)),
+            Arguments.of(ZH_HANS, List.of(ZH_HANS, Locale.CHINA, Locale.CHINESE, Locale.ROOT)),
+            Arguments.of(Locale.CHINA, List.of(Locale.forLanguageTag("zh-Hans-CN"), ZH_HANS, Locale.CHINA, Locale.CHINESE, Locale.ROOT)),
+            Arguments.of(ZH_HANS_SG, List.of(ZH_HANS_SG, ZH_HANS, Locale.forLanguageTag("zh-SG"), Locale.CHINESE, Locale.ROOT)),
+
+            // non-likely script, explicit (as of CLDR 45)
+            Arguments.of(AZ_ARAB, List.of(AZ_ARAB, Locale.ROOT)),
+            Arguments.of(AZ_CYRL, List.of(AZ_CYRL, Locale.ROOT)),
+            Arguments.of(EN_DSRT, List.of(EN_DSRT, Locale.ROOT)),
+            Arguments.of(ZH_HANT, List.of(ZH_HANT, Locale.ROOT)),
+            Arguments.of(Locale.TAIWAN, List.of(Locale.forLanguageTag("zh-Hant-TW"), ZH_HANT, Locale.ROOT)),
+            Arguments.of(ZH_HANT_MO, List.of(ZH_HANT_MO, Locale.forLanguageTag("zh-Hant-HK"), ZH_HANT, Locale.ROOT)),
+
+            // non-likely script, implicit
+            Arguments.of(AZ_XXXX, List.of(AZ_XXXX, Locale.ROOT)),
+            Arguments.of(RU_LATN, List.of(RU_LATN, Locale.ROOT)),
+            Arguments.of(RU_XXXX, List.of(RU_XXXX, Locale.ROOT)),
+            Arguments.of(EN_XXXX, List.of(EN_XXXX, Locale.ROOT)),
+            Arguments.of(ZH_XXXX, List.of(ZH_XXXX, Locale.ROOT))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("parentLocales")
+    public void checkParentLocales(Locale locale, List<Locale> expected) {
+        var actual = CLDR_LOCALE_PROVIDER_ADAPTER.getCandidateLocales("", locale);
+        assertEquals(expected, actual);
+    }
+}
diff --git a/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
index 275043ed8d8db..5d06288fb59b5 100644
--- a/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -22,6 +22,8 @@
  */
 
 import java.io.IOException;
+import java.lang.classfile.ClassFile;
+import java.lang.constant.MethodTypeDesc;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -29,6 +31,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.testng.Assert;
 import tests.Helper;
 import tests.JImageGenerator;
 import tests.JImageValidator;
@@ -37,9 +40,12 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
- /*
+import static java.lang.constant.ConstantDescs.CD_Object;
+import static java.lang.constant.ConstantDescs.CD_int;
+
+/*
  * @test
- * @bug 8252919
+ * @bug 8252919 8327499
  * @library ../../lib
  * @summary Test --generate-jli-classes plugin
  * @enablePreview
@@ -122,6 +128,47 @@ public static void nonExistentTraceFile() throws IOException {
         validateHolderClasses(image);
     }
 
+    @Test
+    public static void testInvokers() throws IOException {
+        var fileString = "[LF_RESOLVE] java.lang.invoke.Invokers$Holder invoker L3I_L (fail)";
+        Path invokersTrace = Files.createTempFile("invokers", "trace");
+        Files.writeString(invokersTrace, fileString, Charset.defaultCharset());
+        Result result = JImageGenerator.getJLinkTask()
+                .modulePath(helper.defaultModulePath())
+                .output(helper.createNewImageDir("jli-invokers"))
+                .option("--generate-jli-classes=@" + invokersTrace.toString())
+                .addMods("java.base")
+                .call();
+
+        var image = result.assertSuccess();
+        var targetMtd = MethodTypeDesc.of(CD_Object, CD_Object, CD_Object, CD_Object, CD_int);
+
+        validateHolderClasses(image);
+        JImageValidator.validate(image.resolve("lib").resolve("modules"),
+                List.of(), List.of(), bytes -> {
+                    var cf = ClassFile.of().parse(bytes);
+                    if (!cf.thisClass().name().equalsString("java/lang/invoke/Invokers$Holder")) {
+                        return;
+                    }
+
+                    boolean found = false;
+                    for (var m : cf.methods()) {
+                        // LambdaForm.Kind
+                        if (m.methodName().equalsString("invoker") && m.methodTypeSymbol().equals(targetMtd)) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        var methodsInfo = cf.methods().stream()
+                                .map(m -> m.methodName() + m.methodTypeSymbol().displayDescriptor())
+                                .collect(Collectors.joining("\n"));
+
+                        Assert.fail("Missing invoker L3I_L in java.lang.invoke.Invokers$Holder, found:\n" + methodsInfo);
+                    }
+                });
+    }
+
     private static void validateHolderClasses(Path image) throws IOException {
         JImageValidator.validate(image.resolve("lib").resolve("modules"),
                 List.of("/java.base/java/lang/invoke/DirectMethodHandle$Holder.class",
diff --git a/test/jdk/tools/lib/tests/JImageValidator.java b/test/jdk/tools/lib/tests/JImageValidator.java
index 125afb9d24cf1..3d22a558dbd98 100644
--- a/test/jdk/tools/lib/tests/JImageValidator.java
+++ b/test/jdk/tools/lib/tests/JImageValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -32,6 +32,7 @@
 import java.util.Properties;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.ClassHierarchyResolver;
+import java.util.function.Consumer;
 
 import jdk.internal.jimage.BasicImageReader;
 import jdk.internal.jimage.ImageLocation;
@@ -172,6 +173,11 @@ private static boolean isWindows() {
 
     public static void validate(Path jimage, List<String> expectedLocations,
             List<String> unexpectedPaths) throws IOException {
+        validate(jimage, expectedLocations, unexpectedPaths, _ -> {});
+    }
+
+    public static void validate(Path jimage, List<String> expectedLocations,
+            List<String> unexpectedPaths, Consumer<byte[]> classChecker) throws IOException {
         BasicImageReader reader = BasicImageReader.open(jimage);
         // Validate expected locations
         List<String> seenLocations = new ArrayList<>();
@@ -195,6 +201,7 @@ public static void validate(Path jimage, List<String> expectedLocations,
                         throw new IOException("NULL RESOURCE " + s);
                     }
                     readClass(r);
+                    classChecker.accept(r);
                 } catch (IOException ex) {
                     System.err.println(s + " ERROR " + ex);
                     throw ex;
@@ -222,7 +229,7 @@ public long getModuleLauncherExecutionTime() {
         return moduleExecutionTime;
     }
 
-    public static void readClass(byte[] clazz) throws IOException{
+    public static void readClass(byte[] clazz) throws IOException {
         var errors = ClassFile.of(
                 //resolution of all classes as interfaces cancels assignability verification
                 ClassFile.ClassHierarchyResolverOption.of(cls -> ClassHierarchyResolver.ClassHierarchyInfo.ofInterface()))
diff --git a/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java b/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
index 9e985e7d5d123..2e2d0d0f84d6d 100644
--- a/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
+++ b/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
@@ -66,7 +66,7 @@ public static void main(String... args) throws Exception {
 
     static final PrintStream out = System.err;
 
-    List<String> MISSING_IN_MAN_PAGE = List.of("--no-fonts");
+    List<String> MISSING_IN_MAN_PAGE = List.of();
 
     void run(String... args) throws Exception {
         var file = args.length == 0 ? findDefaultFile() : Path.of(args[0]);
diff --git a/test/langtools/jdk/jshell/ConsoleToolTest.java b/test/langtools/jdk/jshell/ConsoleToolTest.java
new file mode 100644
index 0000000000000..8fa85a3ec2787
--- /dev/null
+++ b/test/langtools/jdk/jshell/ConsoleToolTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8331535
+ * @summary Test the JShell tool Console handling
+ * @modules jdk.internal.le/jdk.internal.org.jline.reader
+ *          jdk.jshell/jdk.internal.jshell.tool:+open
+ * @build ConsoleToolTest ReplToolTesting
+ * @run testng ConsoleToolTest
+ */
+
+
+import org.testng.annotations.Test;
+
+public class ConsoleToolTest extends ReplToolTesting {
+
+    @Test
+    public void testOutput() {
+        test(
+             a -> {assertCommandWithOutputAndTerminal(a,
+                                                      "System.console().readLine(\"%%s\");\ninput", //newline automatically appended
+                                                      "$1 ==> \"input\"",
+                                                      """
+                                                      \u0005System.console().readLine(\"%%s\");
+                                                      %sinput
+                                                      """);},
+             a -> {assertCommandWithOutputAndTerminal(a,
+                                                      "System.console().readPassword(\"%%s\");\ninput!", //newline automatically appended
+                                                      "$2 ==> char[6] { 'i', 'n', 'p', 'u', 't', '!' }",
+                                                      """
+                                                      \u0005System.console().readPassword(\"%%s\");
+                                                      %s
+                                                      """);}
+            );
+    }
+
+    void assertCommandWithOutputAndTerminal(boolean a, String command, String out, String terminalOut) {
+        assertCommand(a, command, out, null, null, null, null, terminalOut);
+    }
+
+}
diff --git a/test/langtools/jdk/jshell/ExecPtyGetFlagsToSetTest.java b/test/langtools/jdk/jshell/ExecPtyGetFlagsToSetTest.java
index 36f966449612e..efd1cd010cdc0 100644
--- a/test/langtools/jdk/jshell/ExecPtyGetFlagsToSetTest.java
+++ b/test/langtools/jdk/jshell/ExecPtyGetFlagsToSetTest.java
@@ -26,7 +26,7 @@
  * @bug 8224184
  * @summary Control Char <UNDEF> check for pty
  * @modules jdk.internal.le/jdk.internal.org.jline.terminal
- *          jdk.internal.le/jdk.internal.org.jline.terminal.impl
+ *          jdk.internal.le/jdk.internal.org.jline.terminal.impl.exec
  *          jdk.internal.le/jdk.internal.org.jline.terminal.spi
  * @requires (os.family == "linux") | (os.family == "aix")
  */
@@ -35,12 +35,13 @@
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Attributes.ControlChar;
 import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
-import jdk.internal.org.jline.terminal.impl.ExecPty;
+import jdk.internal.org.jline.terminal.impl.exec.ExecPty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 
 public class ExecPtyGetFlagsToSetTest extends ExecPty {
-    public ExecPtyGetFlagsToSetTest(String name, TerminalProvider.Stream stream) {
-        super(name, stream);
+    public ExecPtyGetFlagsToSetTest(TerminalProvider provider, SystemStream stream, String name) {
+        super(provider, stream, name);
     }
 
     @Override
@@ -50,7 +51,7 @@ protected List<String> getFlagsToSet(Attributes attr, Attributes current) {
 
     public static void main(String[] args) {
         ExecPtyGetFlagsToSetTest testPty =
-            new ExecPtyGetFlagsToSetTest("stty", TerminalProvider.Stream.Output);
+            new ExecPtyGetFlagsToSetTest(null, SystemStream.Output, "stty");
 
         Attributes attr = new Attributes();
         Attributes current = new Attributes();
diff --git a/test/langtools/jdk/jshell/ReplToolTesting.java b/test/langtools/jdk/jshell/ReplToolTesting.java
index 52eb2d5798c6f..589b7b5cf39d4 100644
--- a/test/langtools/jdk/jshell/ReplToolTesting.java
+++ b/test/langtools/jdk/jshell/ReplToolTesting.java
@@ -221,6 +221,12 @@ public String getUserErrorOutput() {
         return s;
     }
 
+    public String getTerminalOutput() {
+        String s = normalizeLineEndings("\r\n", console.data.toString());
+        console.data.reset();
+        return s;
+    }
+
     public void test(ReplTest... tests) {
         test(new String[0], tests);
     }
@@ -476,6 +482,7 @@ public void dropMethod(boolean after, String cmd, String name, String output) {
 
     public void dropClass(boolean after, String cmd, String name, String output) {
         dropKey(after, cmd, name, classes, output);
+
     }
 
     public void dropImport(boolean after, String cmd, String name, String output) {
@@ -532,6 +539,11 @@ public void assertCommandCheckUserOutput(boolean after, String cmd, Consumer<Str
 
     public void assertCommand(boolean after, String cmd, String out, String err,
             String userinput, String print, String usererr) {
+        assertCommand(after, cmd, out, err, userinput, print, usererr, null);
+    }
+
+    public void assertCommand(boolean after, String cmd, String out, String err,
+            String userinput, String print, String usererr, String terminalOut) {
         if (!after) {
             if (userinput != null) {
                 setUserInput(userinput);
@@ -546,6 +558,7 @@ public void assertCommand(boolean after, String cmd, String out, String err,
             assertOutput(getCommandErrorOutput(), err, "command error: " + cmd);
             assertOutput(getUserOutput(), print, "user output: " + cmd);
             assertOutput(getUserErrorOutput(), usererr, "user error: " + cmd);
+            assertOutput(getTerminalOutput(), terminalOut, "terminal output: " + cmd);
         }
     }
 
@@ -565,7 +578,11 @@ public void assertOutput(String got, String expected, String display) {
     }
 
     private String normalizeLineEndings(String text) {
-        return ANSI_CODE_PATTERN.matcher(text.replace(System.getProperty("line.separator"), "\n")).replaceAll("");
+        return normalizeLineEndings(System.getProperty("line.separator"), text);
+    }
+
+    private String normalizeLineEndings(String lineSeparator, String text) {
+        return ANSI_CODE_PATTERN.matcher(text.replace(lineSeparator, "\n")).replaceAll("");
     }
         private static final Pattern ANSI_CODE_PATTERN = Pattern.compile("\033\\[[\060-\077]*[\040-\057]*[\100-\176]");
 
@@ -846,6 +863,7 @@ public synchronized void close() throws IOException {
 
     class PromptedCommandOutputStream extends OutputStream {
         private final ReplTest[] tests;
+        private final ByteArrayOutputStream data = new ByteArrayOutputStream();
         private int index = 0;
         PromptedCommandOutputStream(ReplTest[] tests) {
             this.tests = tests;
@@ -861,7 +879,8 @@ public synchronized void write(int b) {
                     fail("Did not exit Repl tool after test");
                 }
                 ++index;
-            } // For now, anything else is thrown away
+            }
+            data.write(b);
         }
 
         @Override
diff --git a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithRecordPatterns.java b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithRecordPatterns.java
index 0c22c987f6c41..dce025a0708c1 100644
--- a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithRecordPatterns.java
+++ b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithRecordPatterns.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8304487
+ * @bug 8304487 8327683 8330387
  * @summary Compiler Implementation for Primitive types in patterns, instanceof, and switch (Preview)
  * @enablePreview
  * @compile PrimitiveInstanceOfPatternOpWithRecordPatterns.java
@@ -42,6 +42,7 @@ public static void main(String[] args) {
         assertEquals(true,  unboxingWithObject());
         assertEquals(true,  wideningReferenceConversionUnboxing());
         assertEquals(true,  wideningReferenceConversionUnboxing2());
+        assertEquals(true,  wideningReferenceConversionUnboxing3());
         assertEquals(true,  wideningReferenceConversionUnboxingAndWideningPrimitive());
         assertEquals(true,  unboxingAndWideningPrimitiveExact());
         assertEquals(false, unboxingAndWideningPrimitiveNotExact());
@@ -114,6 +115,11 @@ public static boolean wideningReferenceConversionUnboxing2() {
         return i instanceof R_generic2(byte _);
     }
 
+    public static boolean wideningReferenceConversionUnboxing3() {
+        R_generic<Integer> i = new R_generic<Integer>(0x1000000);
+        return i instanceof R_generic(float _);
+    }
+
     public static boolean wideningReferenceConversionUnboxingAndWideningPrimitive() {
         R_generic<Integer> i = new R_generic<Integer>(42);
         return i instanceof R_generic(double _);
diff --git a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java
index 545c24828253d..5c6d3e6361da1 100644
--- a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java
+++ b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8304487 8325257
+ * @bug 8304487 8325257 8327683 8330387
  * @summary Compiler Implementation for Primitive types in patterns, instanceof, and switch (Preview)
  * @enablePreview
  * @compile PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java
@@ -44,6 +44,7 @@ public static void main(String[] args) {
         assertEquals(true,  unboxingWithObject());
         assertEquals(true,  wideningReferenceConversionUnboxing(42));
         assertEquals(true,  wideningReferenceConversionUnboxing2(Byte.valueOf((byte) 42)));
+        assertEquals(true,  wideningReferenceConversionUnboxing3(0x1000000));
         assertEquals(true,  wideningReferenceConversionUnboxingAndWideningPrimitive(42));
         assertEquals(true,  unboxingAndWideningPrimitiveExact());
         assertEquals(false, unboxingAndWideningPrimitiveNotExact());
@@ -121,6 +122,10 @@ public static <T extends Byte> boolean wideningReferenceConversionUnboxing2(T i)
         return i instanceof byte bb;
     }
 
+    public static <T extends Integer> boolean wideningReferenceConversionUnboxing3(T i) {
+        return i instanceof float ff;
+    }
+
     public static <T extends Integer> boolean wideningReferenceConversionUnboxingAndWideningPrimitive(T i) {
         return i instanceof double ii;
     }
diff --git a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfTypeComparisonOp.java b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfTypeComparisonOp.java
index 7110d2b2d8f8d..47686c98a42cc 100644
--- a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfTypeComparisonOp.java
+++ b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfTypeComparisonOp.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8304487 8325257
+ * @bug 8304487 8325257 8327683 8330387
  * @summary Compiler Implementation for Primitive types in patterns, instanceof, and switch (Preview)
  * @enablePreview
  * @compile PrimitiveInstanceOfTypeComparisonOp.java
@@ -44,6 +44,7 @@ public static void main(String[] args) {
         assertEquals(true,  unboxingWithObject());
         assertEquals(true,  wideningReferenceConversionUnboxing(42));
         assertEquals(true,  wideningReferenceConversionUnboxing2(Byte.valueOf((byte) 42)));
+        assertEquals(true,  wideningReferenceConversionUnboxing3(0x1000000));
         assertEquals(true,  wideningReferenceConversionUnboxingAndWideningPrimitive(42));
         assertEquals(true,  unboxingAndWideningPrimitiveExact());
         assertEquals(false, unboxingAndWideningPrimitiveNotExact());
@@ -121,6 +122,10 @@ public static <T extends Byte> boolean wideningReferenceConversionUnboxing2(T i)
         return i instanceof byte;
     }
 
+    public static <T extends Integer> boolean wideningReferenceConversionUnboxing3(T i) {
+        return i instanceof float;
+    }
+
     public static <T extends Integer> boolean wideningReferenceConversionUnboxingAndWideningPrimitive(T i) {
         return i instanceof double;
     }
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
index 72489d562ea74..4186b83f2f10e 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
@@ -261,4 +261,8 @@ public static char disallowedUnboxingAndWidening(Short test) {
             case char c -> c; // Error - not exhaustive and not allowed
         };
     }
+
+    public static <T extends Integer> boolean wideningReferenceConversionUnboxingAndNarrowingPrimitive(T i) {
+        return i instanceof byte b;  // not allowed as a conversion
+    }
 }
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
index 22178944b7cb9..1cbf288e774d9 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
@@ -29,6 +29,7 @@ PrimitivePatternsSwitchErrors.java:216:18: compiler.err.prob.found.req: (compile
 PrimitivePatternsSwitchErrors.java:248:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Long, char)
 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:30:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:37:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:44:16: compiler.err.not.exhaustive
@@ -43,4 +44,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
+44 errors
diff --git a/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java b/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java
new file mode 100644
index 0000000000000..c8d9ad85d548e
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang.classfile;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.lang.classfile.TypeKind;
+import java.lang.constant.ClassDesc;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Performance of conversion from type descriptor objects to type kind.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 3, time = 2)
+@Measurement(iterations = 6, time = 1)
+@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@State(Scope.Thread)
+public class TypeKindBench {
+
+    public enum ClassType {
+        PRIMITIVE, REFERENCE, MIXED;
+    }
+
+    @Param
+    ClassType type;
+    Class<?>[] classes;
+    ClassDesc[] classDescs;
+
+    @Setup
+    public void setup() {
+        var references = List.of(Character.class, String.class, Integer.class,
+                Long.class, Object.class, int[].class, TypeKindBench.class,
+                Byte[].class, boolean[][].class);
+        var primitives = List.of(int.class, long.class, void.class, double.class,
+                float.class, boolean.class, char.class, short.class, byte.class);
+        final List<Class<?>> candidates = switch (type) {
+            case REFERENCE -> references;
+            case PRIMITIVE -> primitives;
+            case MIXED -> {
+                var list = new ArrayList<Class<?>>(references.size() + primitives.size());
+                list.addAll(references);
+                list.addAll(primitives);
+                yield list;
+            }
+        };
+
+        // Use fixed seed to ensure results are comparable across
+        // different JVMs
+        classes = new Random(0xbf5fe40dd887d9e2L)
+                .ints(100, 0, candidates.size())
+                .mapToObj(candidates::get)
+                .toArray(Class<?>[]::new);
+        classDescs = Arrays.stream(classes)
+                .map(cl -> cl.describeConstable().orElseThrow())
+                .toArray(ClassDesc[]::new);
+    }
+
+    @Benchmark
+    public void fromClasses(Blackhole bh) {
+        for (var clz : classes) {
+            bh.consume(TypeKind.from(clz));
+        }
+    }
+
+    @Benchmark
+    public void fromClassDescs(Blackhole bh) {
+        for (var clz : classDescs) {
+            bh.consume(TypeKind.from(clz));
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
index c1c04ebd8d704..91ce8faec3854 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -23,6 +23,7 @@
 package org.openjdk.bench.java.lang.foreign;
 
 import java.lang.foreign.Arena;
+import java.lang.foreign.MemoryLayout;
 import java.lang.foreign.MemorySegment;
 
 import org.openjdk.jmh.annotations.Benchmark;
@@ -37,6 +38,8 @@
 import org.openjdk.jmh.annotations.Warmup;
 import sun.misc.Unsafe;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.concurrent.TimeUnit;
@@ -57,6 +60,13 @@ public class LoopOverNonConstant extends JavaLayouts {
     static final int CARRIER_SIZE = (int)JAVA_INT.byteSize();
     static final int ALLOC_SIZE = ELEM_SIZE * CARRIER_SIZE;
 
+    static final VarHandle VH_SEQ_INT = bindToZeroOffset(MemoryLayout.sequenceLayout(ELEM_SIZE, JAVA_INT).varHandle(PathElement.sequenceElement()));
+    static final VarHandle VH_SEQ_INT_UNALIGNED = bindToZeroOffset(MemoryLayout.sequenceLayout(ELEM_SIZE, JAVA_INT.withByteAlignment(1)).varHandle(PathElement.sequenceElement()));
+
+    static VarHandle bindToZeroOffset(VarHandle varHandle) {
+        return MethodHandles.insertCoordinates(varHandle, 1, 0L);
+    }
+
     Arena arena;
     MemorySegment segment;
     long unsafe_addr;
@@ -132,6 +142,24 @@ public int segment_loop_unaligned() {
         return sum;
     }
 
+    @Benchmark
+    public int segment_loop_nested() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_SIZE; i++) {
+            sum += (int) VH_SEQ_INT.get(segment, (long) i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int segment_loop_nested_unaligned() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_SIZE; i++) {
+            sum += (int) VH_SEQ_INT_UNALIGNED.get(segment, (long) i);
+        }
+        return sum;
+    }
+
     @Benchmark
     public int segment_loop_instance() {
         int sum = 0;