diff --git a/make/ModuleWrapper.gmk b/make/ModuleWrapper.gmk
index e99f34cdd71..51208432ea0 100644
--- a/make/ModuleWrapper.gmk
+++ b/make/ModuleWrapper.gmk
@@ -51,7 +51,7 @@ ifeq ($(MAKEFILE_PREFIX), Lib)
   # which static library files to include. The variable $(MODULE)_INCLUDED_LIBS is
   # added to for each call to SetupJdkLibrary. The file module-included-libs.txt is then
   # read in StaticLibs.gmk.
-  ifneq ($($(MODULE)_JDK_LIBS), )
+  ifneq ($($(MODULE)_INCLUDED_LIBS), )
     LIBLIST := $(SUPPORT_OUTPUTDIR)/modules_static-libs/$(MODULE)/module-included-libs.txt
 
     $(LIBLIST): $(TARGETS)
diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4
index 5a6142d5092..aa9662e2100 100644
--- a/make/autoconf/util.m4
+++ b/make/autoconf/util.m4
@@ -575,7 +575,7 @@ AC_DEFUN([UTIL_CHECK_TYPE_directory],
 
   if test "[x]ARG_CHECK_FOR_FILES" != "x:"; then
     for file in ARG_CHECK_FOR_FILES; do
-      found_files=$($ECHO $(ls $1/$file 2> /dev/null))
+      found_files=$($ECHO $($LS -d $1/$file 2> /dev/null))
       if test "x$found_files" = x; then
         FAILURE="Directory $1 does not contain $file"
         break
diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index 0a4c2d9a48d..da9ff2029e8 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -89,6 +89,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
     SRC := $(MICROBENCHMARK_SRC), \
     BIN := $(MICROBENCHMARK_CLASSES), \
     JAVAC_FLAGS := \
+        --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.event=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 3b0c8ae432c..5cc57976296 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -206,8 +206,8 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg, Register
   // Handle existing monitor.
   bind(object_has_monitor);
 
-  // Try to CAS owner (no owner => current thread's _lock_id).
-  ldr(rscratch2, Address(rthread, JavaThread::lock_id_offset()));
+  // Try to CAS owner (no owner => current thread's _monitor_owner_id).
+  ldr(rscratch2, Address(rthread, JavaThread::monitor_owner_id_offset()));
   add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset())-markWord::monitor_value));
   cmpxchg(tmp, zr, rscratch2, Assembler::xword, /*acquire*/ true,
           /*release*/ true, /*weak*/ false, tmp3Reg); // Sets flags for result
@@ -469,8 +469,8 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
     // Compute owner address.
     lea(t2_owner_addr, owner_address);
 
-    // Try to CAS owner (no owner => current thread's _lock_id).
-    ldr(rscratch2, Address(rthread, JavaThread::lock_id_offset()));
+    // Try to CAS owner (no owner => current thread's _monitor_owner_id).
+    ldr(rscratch2, Address(rthread, JavaThread::monitor_owner_id_offset()));
     cmpxchg(t2_owner_addr, zr, rscratch2, Assembler::xword, /*acquire*/ true,
             /*release*/ false, /*weak*/ false, t3_owner);
     br(Assembler::EQ, monitor_locked);
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 994521ba48f..511f0f2e96c 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -2664,10 +2664,10 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register
   // Handle existing monitor.
   bind(object_has_monitor);
 
-  // Try to CAS owner (no owner => current thread's _lock_id).
+  // Try to CAS owner (no owner => current thread's _monitor_owner_id).
   addi(temp, displaced_header, in_bytes(ObjectMonitor::owner_offset()) - markWord::monitor_value);
   Register thread_id = displaced_header;
-  ld(thread_id, in_bytes(JavaThread::lock_id_offset()), R16_thread);
+  ld(thread_id, in_bytes(JavaThread::monitor_owner_id_offset()), R16_thread);
   cmpxchgd(/*flag=*/flag,
            /*current_value=*/current_header,
            /*compare_value=*/(intptr_t)0,
@@ -2944,9 +2944,9 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
       addi(owner_addr, monitor, in_bytes(ObjectMonitor::owner_offset()));
     }
 
-    // Try to CAS owner (no owner => current thread's _lock_id).
+    // Try to CAS owner (no owner => current thread's _monitor_owner_id).
     assert_different_registers(thread_id, monitor, owner_addr, box, R0);
-    ld(thread_id, in_bytes(JavaThread::lock_id_offset()), R16_thread);
+    ld(thread_id, in_bytes(JavaThread::monitor_owner_id_offset()), R16_thread);
     cmpxchgd(/*flag=*/CCR0,
             /*current_value=*/R0,
             /*compare_value=*/(intptr_t)0,
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 2125f67cf9d..122ea7352fe 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -116,10 +116,10 @@ void C2_MacroAssembler::fast_lock(Register objectReg, Register boxReg,
   // Handle existing monitor.
   bind(object_has_monitor);
 
-  // Try to CAS owner (no owner => current thread's _lock_id).
+  // Try to CAS owner (no owner => current thread's _monitor_owner_id).
   add(tmp, disp_hdr, (in_bytes(ObjectMonitor::owner_offset()) - markWord::monitor_value));
   Register tid = tmp4Reg;
-  ld(tid, Address(xthread, JavaThread::lock_id_offset()));
+  ld(tid, Address(xthread, JavaThread::monitor_owner_id_offset()));
   cmpxchg(/*memory address*/tmp, /*expected value*/zr, /*new value*/tid, Assembler::int64,
           Assembler::aq, Assembler::rl, /*result*/tmp3Reg); // cas succeeds if tmp3Reg == zr(expected)
 
@@ -400,9 +400,9 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
     // Compute owner address.
     la(tmp2_owner_addr, owner_address);
 
-    // Try to CAS owner (no owner => current thread's _lock_id).
+    // Try to CAS owner (no owner => current thread's _monitor_owner_id).
     Register tid = tmp4;
-    ld(tid, Address(xthread, JavaThread::lock_id_offset()));
+    ld(tid, Address(xthread, JavaThread::monitor_owner_id_offset()));
     cmpxchg(/*addr*/ tmp2_owner_addr, /*expected*/ zr, /*new*/ tid, Assembler::int64,
             /*acquire*/ Assembler::aq, /*release*/ Assembler::relaxed, /*result*/ tmp3_owner);
     beqz(tmp3_owner, monitor_locked);
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index c297c66b02b..e8a04e9063b 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -3825,11 +3825,11 @@ void MacroAssembler::compiler_fast_lock_object(Register oop, Register box, Regis
   Register zero = temp;
   Register monitor_tagged = displacedHeader; // Tagged with markWord::monitor_value.
 
-  // Try to CAS owner (no owner => current thread's _lock_id).
+  // Try to CAS owner (no owner => current thread's _monitor_owner_id).
   // If csg succeeds then CR=EQ, otherwise, register zero is filled
   // with the current owner.
   z_lghi(zero, 0);
-  z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::lock_id_offset()));
+  z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::monitor_owner_id_offset()));
   z_csg(zero, Z_R0_scratch, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner), monitor_tagged);
 
   // Store a non-null value into the box.
@@ -3904,7 +3904,7 @@ void MacroAssembler::compiler_fast_unlock_object(Register oop, Register box, Reg
   // Handle existing monitor.
   bind(object_has_monitor);
 
-  z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::lock_id_offset()));
+  z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::monitor_owner_id_offset()));
   z_cg(Z_R0_scratch, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)));
   z_brne(done);
 
@@ -6608,11 +6608,11 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Registe
     const Address recursions_address(tmp1_monitor, ObjectMonitor::recursions_offset() - monitor_tag);
 
 
-    // Try to CAS owner (no owner => current thread's _lock_id).
+    // Try to CAS owner (no owner => current thread's _monitor_owner_id).
     // If csg succeeds then CR=EQ, otherwise, register zero is filled
     // with the current owner.
     z_lghi(zero, 0);
-    z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::lock_id_offset()));
+    z_lg(Z_R0_scratch, Address(Z_thread, JavaThread::monitor_owner_id_offset()));
     z_csg(zero, Z_R0_scratch, owner_address);
     z_bre(monitor_locked);
 
diff --git a/src/hotspot/cpu/s390/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp
index ee3f97f26ef..a5195e753bb 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.cpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.cpp
@@ -57,7 +57,7 @@ unsigned int  VM_Version::_Icache_lineSize                             = DEFAULT
 
 // The following list contains the (approximate) announcement/availability
 // dates of the many System z generations in existence as of now.
-// Information compiled from https://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/TD105503
+// Information compiled from https://www.ibm.com/support/pages/ibm-mainframe-life-cycle-history
 //   z900: 2000-10
 //   z990: 2003-06
 //   z9:   2005-09
@@ -68,12 +68,13 @@ unsigned int  VM_Version::_Icache_lineSize                             = DEFAULT
 //   z13:  2015-03
 //   z14:  2017-09
 //   z15:  2019-09
+//   z16:  2022-05
 
-static const char* z_gen[]      = {"  ", "G1",         "G2",         "G3",         "G4",         "G5",         "G6",         "G7",         "G8",         "G9"  };
-static const char* z_machine[]  = {"  ", "2064",       "2084",       "2094",       "2097",       "2817",       "2827",       "2964",       "3906",       "8561" };
-static const char* z_name[]     = {"  ", "z900",       "z990",       "z9 EC",      "z10 EC",     "z196 EC",    "ec12",       "z13",        "z14",        "z15" };
-static const char* z_WDFM[]     = {"  ", "2006-06-30", "2008-06-30", "2010-06-30", "2012-06-30", "2014-06-30", "2016-12-31", "2019-06-30", "2021-06-30", "tbd" };
-static const char* z_EOS[]      = {"  ", "2014-12-31", "2014-12-31", "2017-10-31", "2019-12-31", "2021-12-31", "tbd",        "tbd",        "tbd",        "tbd" };
+static const char* z_gen[]      = {"  ", "G1",         "G2",         "G3",         "G4",         "G5",         "G6",         "G7",         "G8",         "G9",         "G10" };
+static const char* z_machine[]  = {"  ", "2064",       "2084",       "2094",       "2097",       "2817",       "2827",       "2964",       "3906",       "8561",       "3931" };
+static const char* z_name[]     = {"  ", "z900",       "z990",       "z9 EC",      "z10 EC",     "z196 EC",    "ec12",       "z13",        "z14",        "z15",        "z16" };
+static const char* z_WDFM[]     = {"  ", "2006-06-30", "2008-06-30", "2010-06-30", "2012-06-30", "2014-06-30", "2016-12-31", "2019-06-30", "2021-06-30", "2024-12-31", "tbd" };
+static const char* z_EOS[]      = {"  ", "2014-12-31", "2014-12-31", "2017-10-31", "2019-12-31", "2021-12-31", "2023-12-31", "2024-12-31", "tbd",        "tbd",        "tbd" };
 static const char* z_features[] = {"  ",
                                    "system-z, g1-z900, ldisp",
                                    "system-z, g2-z990, ldisp_fast",
@@ -83,7 +84,9 @@ static const char* z_features[] = {"  ",
                                    "system-z, g6-ec12, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm",
                                    "system-z, g7-z13, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr",
                                    "system-z, g8-z14, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1",
-                                   "system-z, g9-z15, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1, instrext3, venh2"
+                                   "system-z, g9-z15, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1, instrext3, venh2",
+                                   "system-z, g10-z16, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1, instrext3, venh2,"
+                                       "bear_enh, sort_enh, nnpa_assist, storage_key_removal, vpack_decimal_enh"
                                   };
 
 void VM_Version::initialize() {
@@ -337,6 +340,11 @@ int VM_Version::get_model_index() {
   //      is the index of the oldest detected model.
   int ambiguity = 0;
   int model_ix  = 0;
+  if (is_z16()) {
+    model_ix = 10;
+    ambiguity++;
+  }
+
   if (is_z15()) {
     model_ix = 9;
     ambiguity++;
diff --git a/src/hotspot/cpu/s390/vm_version_s390.hpp b/src/hotspot/cpu/s390/vm_version_s390.hpp
index 31fdedc59f6..49e6f5686f6 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.hpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.hpp
@@ -48,8 +48,8 @@ class VM_Version: public Abstract_VM_Version {
 #define  StoreFacilityListExtendedMask  0x0100000000000000UL  // z9
 #define  ETF2Mask                       0x0000800000000000UL  // z900
 #define  CryptoFacilityMask             0x0000400000000000UL  // z990 (aka message-security assist)
-#define  LongDispFacilityMask           0x0000200000000000UL  // z900 with microcode update
-#define  LongDispFacilityHighPerfMask   0x0000300000000000UL  // z990
+#define  LongDispFacilityMask           0x0000200000000000UL  // z900 with microcode update, Bit: 18
+#define  LongDispFacilityHighPerfMask   0x0000100000000000UL  // z990, Bit: 19
 #define  HFPMultiplyAndAddMask          0x0000080000000000UL  // z990
 #define  ExtImmedFacilityMask           0x0000040000000000UL  // z9
 #define  ETF3Mask                       0x0000020000000000UL  // z990/z9 (?)
@@ -64,7 +64,8 @@ class VM_Version: public Abstract_VM_Version {
 #define  ExecuteExtensionsMask          0x0000000010000000UL  // z10
 #define  FPExtensionsMask               0x0000000004000000UL  // z196
 #define  FPSupportEnhancementsMask      0x0000000000400000UL  // z10
-#define  DecimalFloatingPointMask       0x0000000000300000UL  // z10
+#define  DecimalFloatingPointMask       0x0000000000200000UL  // z10, Bit: 42
+#define  DecimalFloatingPointHighPerfMask 0x0000000000100000UL  // z10, Bit: 43
 // z196 begin
 #define  DistinctOpndsMask              0x0000000000040000UL  // z196
 #define  FastBCRSerializationMask       DistinctOpndsMask
@@ -114,6 +115,12 @@ class VM_Version: public Abstract_VM_Version {
 #define  VectorPackedDecimalEnhMask     0x0000008000000000UL  // z15
 #define  CryptoExtension9Mask           0x0000001000000000UL  // z15 (aka message-security assist extension 9)
 #define  DeflateMask                    0x0000010000000000UL  // z15
+#define NNPAssistFacilityMask           0x0000000004000000UL  // z16, Neural-network-processing-assist facility, Bit: 165
+
+// ----------------------------------------------
+// --- FeatureBitString Bits 193..200 (DW[3]) ---
+// ----------------------------------------------
+#define  BEAREnhFacilityMask            0x4000000000000000UL  // z16, BEAR-enhancement facility, Bit: 193
 
   enum {
     _max_cache_levels = 8,    // As limited by ECAG instruction.
@@ -179,9 +186,10 @@ class VM_Version: public Abstract_VM_Version {
   static bool is_z10()  { return has_GnrlInstrExtensions()    && !has_DistinctOpnds(); }
   static bool is_z196() { return has_DistinctOpnds()          && !has_MiscInstrExt(); }
   static bool is_ec12() { return has_MiscInstrExt()           && !has_CryptoExt5(); }
-  static bool is_z13()  { return has_CryptoExt5()             && !has_MiscInstrExt2();}
-  static bool is_z14()  { return has_MiscInstrExt2()          && !has_MiscInstrExt3();}
-  static bool is_z15()  { return has_MiscInstrExt3();}
+  static bool is_z13()  { return has_CryptoExt5()             && !has_MiscInstrExt2(); }
+  static bool is_z14()  { return has_MiscInstrExt2()          && !has_MiscInstrExt3(); }
+  static bool is_z15()  { return has_MiscInstrExt3()          && !has_BEAR_Enh_Facility(); }
+  static bool is_z16()  { return has_BEAR_Enh_Facility(); }
 
   // Need to use nested class with unscoped enum.
   // C++11 declaration "enum class Cipher { ... } is not supported.
@@ -455,6 +463,7 @@ class VM_Version: public Abstract_VM_Version {
   static bool has_FPExtensions()              { return  (_features[0] & FPExtensionsMask)              == FPExtensionsMask; }
   static bool has_FPSupportEnhancements()     { return  (_features[0] & FPSupportEnhancementsMask)     == FPSupportEnhancementsMask; }
   static bool has_DecimalFloatingPoint()      { return  (_features[0] & DecimalFloatingPointMask)      == DecimalFloatingPointMask; }
+  static bool has_DecimalFloatingPointHighPerf() { return  (_features[0] & DecimalFloatingPointHighPerfMask) == DecimalFloatingPointHighPerfMask; }
   static bool has_InterlockedAccessV1()       { return  (_features[0] & InterlockedAccess1Mask)        == InterlockedAccess1Mask; }
   static bool has_LoadAndALUAtomicV1()        { return  (_features[0] & InterlockedAccess1Mask)        == InterlockedAccess1Mask; }
   static bool has_PopCount()                  { return  (_features[0] & PopulationCountMask)           == PopulationCountMask; }
@@ -486,6 +495,9 @@ class VM_Version: public Abstract_VM_Version {
   static bool has_VectorPackedDecimal()       { return  (_features[2] & VectorPackedDecimalMask)       == VectorPackedDecimalMask; }
   static bool has_VectorPackedDecimalEnh()    { return  (_features[2] & VectorPackedDecimalEnhMask)    == VectorPackedDecimalEnhMask; }
 
+  static bool has_BEAR_Enh_Facility()         { return  (_features[3] & BEAREnhFacilityMask)           == BEAREnhFacilityMask; }
+  static bool has_NNP_Assist_Facility()       { return  (_features[2] & NNPAssistFacilityMask)         == NNPAssistFacilityMask; }
+
   // Crypto features query functions.
   static bool has_Crypto_AES_GCM128()         { return has_Crypto() && test_feature_bit(&_cipher_features_KMA[0], Cipher::_AES128, Cipher::_featureBits); }
   static bool has_Crypto_AES_GCM192()         { return has_Crypto() && test_feature_bit(&_cipher_features_KMA[0], Cipher::_AES192, Cipher::_featureBits); }
@@ -508,6 +520,7 @@ class VM_Version: public Abstract_VM_Version {
 
   // CPU feature setters (to force model-specific behaviour). Test/debugging only.
   static void set_has_DecimalFloatingPoint()      { _features[0] |= DecimalFloatingPointMask; }
+  static void set_has_DecimalFloatingPointHighPerf() { _features[0] |= DecimalFloatingPointHighPerfMask; }
   static void set_has_FPSupportEnhancements()     { _features[0] |= FPSupportEnhancementsMask; }
   static void set_has_ExecuteExtensions()         { _features[0] |= ExecuteExtensionsMask; }
   static void set_has_MemWithImmALUOps()          { _features[0] |= GnrlInstrExtFacilityMask; }
@@ -558,6 +571,8 @@ class VM_Version: public Abstract_VM_Version {
   static void set_has_VectorEnhancements2()       { _features[2] |= VectorEnhancements2Mask; }
   static void set_has_VectorPackedDecimal()       { _features[2] |= VectorPackedDecimalMask; }
   static void set_has_VectorPackedDecimalEnh()    { _features[2] |= VectorPackedDecimalEnhMask; }
+  static void set_has_BEAR_Enh_Facility()         { _features[3] |= BEAREnhFacilityMask;}
+  static void set_has_NNP_Assist_Facility()       { _features[2] |= NNPAssistFacilityMask;}
 
   static void reset_has_VectorFacility()          { _features[2] &= ~VectorFacilityMask; }
 
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 8d0af29e91d..008d52dcb1c 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -319,7 +319,7 @@ void C2_MacroAssembler::fast_lock(Register objReg, Register boxReg, Register tmp
   movptr(Address(boxReg, 0), checked_cast<int32_t>(markWord::unused_mark().value()));
 
   // It's inflated and we use scrReg for ObjectMonitor* in this section.
-  movptr(boxReg, Address(r15_thread, JavaThread::lock_id_offset()));
+  movptr(boxReg, Address(r15_thread, JavaThread::monitor_owner_id_offset()));
   movq(scrReg, tmpReg);
   xorq(tmpReg, tmpReg);
   lock();
@@ -625,9 +625,9 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
       movptr(Address(box, BasicLock::object_monitor_cache_offset_in_bytes()), monitor);
     }
 
-    // Try to CAS owner (no owner => current thread's _lock_id).
+    // Try to CAS owner (no owner => current thread's _monitor_owner_id).
     xorptr(rax_reg, rax_reg);
-    movptr(box, Address(thread, JavaThread::lock_id_offset()));
+    movptr(box, Address(thread, JavaThread::monitor_owner_id_offset()));
     lock(); cmpxchgptr(box, owner_address);
     jccb(Assembler::equal, monitor_locked);
 
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 550c8047034..4667922505c 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -4424,21 +4424,21 @@ instruct maxF_reg(legRegF dst, legRegF a, legRegF b, legRegF tmp, legRegF atmp,
   predicate(UseAVX > 0 && !VLoopReductions::is_reduction(n));
   match(Set dst (MaxF a b));
   effect(USE a, USE b, TEMP tmp, TEMP atmp, TEMP btmp);
-  format %{ "maxF $dst, $a, $b \t! using tmp, atmp and btmp as TEMP" %}
+  format %{ "maxF $dst, $a, $b \t! using $tmp, $atmp and $btmp as TEMP" %}
   ins_encode %{
     __ vminmax_fp(Op_MaxV, T_FLOAT, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $tmp$$XMMRegister, $atmp$$XMMRegister, $btmp$$XMMRegister, Assembler::AVX_128bit);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct maxF_reduction_reg(legRegF dst, legRegF a, legRegF b, legRegF xmmt, rRegI tmp, rFlagsReg cr) %{
+instruct maxF_reduction_reg(legRegF dst, legRegF a, legRegF b, legRegF xtmp, rRegI rtmp, rFlagsReg cr) %{
   predicate(UseAVX > 0 && VLoopReductions::is_reduction(n));
   match(Set dst (MaxF a b));
-  effect(USE a, USE b, TEMP xmmt, TEMP tmp, KILL cr);
+  effect(USE a, USE b, TEMP xtmp, TEMP rtmp, KILL cr);
 
-  format %{ "$dst = max($a, $b)\t# intrinsic (float)" %}
+  format %{ "maxF_reduction $dst, $a, $b \t!using $xtmp and $rtmp as TEMP" %}
   ins_encode %{
-    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
+    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xtmp$$XMMRegister, $rtmp$$Register,
                     false /*min*/, true /*single*/);
   %}
   ins_pipe( pipe_slow );
@@ -4449,21 +4449,21 @@ instruct maxD_reg(legRegD dst, legRegD a, legRegD b, legRegD tmp, legRegD atmp,
   predicate(UseAVX > 0 && !VLoopReductions::is_reduction(n));
   match(Set dst (MaxD a b));
   effect(USE a, USE b, TEMP atmp, TEMP btmp, TEMP tmp);
-  format %{ "maxD $dst, $a, $b \t! using tmp, atmp and btmp as TEMP" %}
+  format %{ "maxD $dst, $a, $b \t! using $tmp, $atmp and $btmp as TEMP" %}
   ins_encode %{
     __ vminmax_fp(Op_MaxV, T_DOUBLE, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $tmp$$XMMRegister, $atmp$$XMMRegister, $btmp$$XMMRegister, Assembler::AVX_128bit);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct maxD_reduction_reg(legRegD dst, legRegD a, legRegD b, legRegD xmmt, rRegL tmp, rFlagsReg cr) %{
+instruct maxD_reduction_reg(legRegD dst, legRegD a, legRegD b, legRegD xtmp, rRegL rtmp, rFlagsReg cr) %{
   predicate(UseAVX > 0 && VLoopReductions::is_reduction(n));
   match(Set dst (MaxD a b));
-  effect(USE a, USE b, TEMP xmmt, TEMP tmp, KILL cr);
+  effect(USE a, USE b, TEMP xtmp, TEMP rtmp, KILL cr);
 
-  format %{ "$dst = max($a, $b)\t# intrinsic (double)" %}
+  format %{ "maxD_reduction $dst, $a, $b \t! using $xtmp and $rtmp as TEMP" %}
   ins_encode %{
-    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
+    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xtmp$$XMMRegister, $rtmp$$Register,
                     false /*min*/, false /*single*/);
   %}
   ins_pipe( pipe_slow );
@@ -4474,21 +4474,21 @@ instruct minF_reg(legRegF dst, legRegF a, legRegF b, legRegF tmp, legRegF atmp,
   predicate(UseAVX > 0 && !VLoopReductions::is_reduction(n));
   match(Set dst (MinF a b));
   effect(USE a, USE b, TEMP tmp, TEMP atmp, TEMP btmp);
-  format %{ "minF $dst, $a, $b \t! using tmp, atmp and btmp as TEMP" %}
+  format %{ "minF $dst, $a, $b \t! using $tmp, $atmp and $btmp as TEMP" %}
   ins_encode %{
     __ vminmax_fp(Op_MinV, T_FLOAT, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $tmp$$XMMRegister, $atmp$$XMMRegister, $btmp$$XMMRegister, Assembler::AVX_128bit);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct minF_reduction_reg(legRegF dst, legRegF a, legRegF b, legRegF xmmt, rRegI tmp, rFlagsReg cr) %{
+instruct minF_reduction_reg(legRegF dst, legRegF a, legRegF b, legRegF xtmp, rRegI rtmp, rFlagsReg cr) %{
   predicate(UseAVX > 0 && VLoopReductions::is_reduction(n));
   match(Set dst (MinF a b));
-  effect(USE a, USE b, TEMP xmmt, TEMP tmp, KILL cr);
+  effect(USE a, USE b, TEMP xtmp, TEMP rtmp, KILL cr);
 
-  format %{ "$dst = min($a, $b)\t# intrinsic (float)" %}
+  format %{ "minF_reduction $dst, $a, $b \t! using $xtmp and $rtmp as TEMP" %}
   ins_encode %{
-    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
+    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xtmp$$XMMRegister, $rtmp$$Register,
                     true /*min*/, true /*single*/);
   %}
   ins_pipe( pipe_slow );
@@ -4499,21 +4499,21 @@ instruct minD_reg(legRegD dst, legRegD a, legRegD b, legRegD tmp, legRegD atmp,
   predicate(UseAVX > 0 && !VLoopReductions::is_reduction(n));
   match(Set dst (MinD a b));
   effect(USE a, USE b, TEMP tmp, TEMP atmp, TEMP btmp);
-    format %{ "minD $dst, $a, $b \t! using tmp, atmp and btmp as TEMP" %}
+    format %{ "minD $dst, $a, $b \t! using $tmp, $atmp and $btmp as TEMP" %}
   ins_encode %{
     __ vminmax_fp(Op_MinV, T_DOUBLE, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $tmp$$XMMRegister, $atmp$$XMMRegister, $btmp$$XMMRegister, Assembler::AVX_128bit);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct minD_reduction_reg(legRegD dst, legRegD a, legRegD b, legRegD xmmt, rRegL tmp, rFlagsReg cr) %{
+instruct minD_reduction_reg(legRegD dst, legRegD a, legRegD b, legRegD xtmp, rRegL rtmp, rFlagsReg cr) %{
   predicate(UseAVX > 0 && VLoopReductions::is_reduction(n));
   match(Set dst (MinD a b));
-  effect(USE a, USE b, TEMP xmmt, TEMP tmp, KILL cr);
+  effect(USE a, USE b, TEMP xtmp, TEMP rtmp, KILL cr);
 
-  format %{ "$dst = min($a, $b)\t# intrinsic (double)" %}
+  format %{ "maxD_reduction $dst, $a, $b \t! using $xtmp and $rtmp as TEMP" %}
   ins_encode %{
-    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
+    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xtmp$$XMMRegister, $rtmp$$Register,
                     true /*min*/, false /*single*/);
   %}
   ins_pipe( pipe_slow );
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index a7b0627c0a4..30956b6c793 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -1448,7 +1448,7 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
   // do the compilation
   if (method->is_native()) {
     if (!PreferInterpreterNativeStubs || method->is_method_handle_intrinsic()) {
-#if defined(X86) && !defined(ZERO)
+#if defined(IA32) && !defined(ZERO)
       // The following native methods:
       //
       // java.lang.Float.intBitsToFloat
@@ -1470,7 +1470,7 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
             method->intrinsic_id() == vmIntrinsics::_doubleToRawLongBits))) {
         return nullptr;
       }
-#endif // X86 && !ZERO
+#endif // IA32 && !ZERO
 
       // To properly handle the appendix argument for out-of-line calls we are using a small trampoline that
       // pops off the appendix argument and jumps to the target (see gen_special_dispatch in SharedRuntime).
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index bde157a34e1..ba47e559957 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -227,7 +227,7 @@
   nonstatic_field(JavaThread,                  _vthread,                                      OopHandle)                             \
   nonstatic_field(JavaThread,                  _scopedValueCache,                             OopHandle)                             \
   nonstatic_field(JavaThread,                  _anchor,                                       JavaFrameAnchor)                       \
-  nonstatic_field(JavaThread,                  _lock_id,                                      int64_t)                               \
+  nonstatic_field(JavaThread,                  _monitor_owner_id,                             int64_t)                               \
   nonstatic_field(JavaThread,                  _vm_result,                                    oop)                                   \
   nonstatic_field(JavaThread,                  _stack_overflow_state._stack_overflow_limit,   address)                               \
   volatile_nonstatic_field(JavaThread,         _exception_oop,                                oop)                                   \
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 39bac0bc14f..1072a5d6a24 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -3682,10 +3682,10 @@ bool LibraryCallKit::inline_native_setCurrentThread() {
   const TypePtr *adr_type = _gvn.type(thread_obj_handle)->isa_ptr();
   access_store_at(nullptr, thread_obj_handle, adr_type, arr, _gvn.type(arr), T_OBJECT, IN_NATIVE | MO_UNORDERED);
 
-  // Change the lock_id of the JavaThread
+  // Change the _monitor_owner_id of the JavaThread
   Node* tid = load_field_from_object(arr, "tid", "J");
-  Node* thread_id_offset = basic_plus_adr(thread, in_bytes(JavaThread::lock_id_offset()));
-  Node* tid_memory = store_to_memory(control(), thread_id_offset, tid, T_LONG, MemNode::unordered, true);
+  Node* monitor_owner_id_offset = basic_plus_adr(thread, in_bytes(JavaThread::monitor_owner_id_offset()));
+  store_to_memory(control(), monitor_owner_id_offset, tid, T_LONG, MemNode::unordered, true);
 
   JFR_ONLY(extend_setCurrentThread(thread, arr);)
   return true;
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index b8e7f9c1ea2..6192ff064a9 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -2977,8 +2977,8 @@ JVM_ENTRY(void, JVM_SetCurrentThread(JNIEnv* env, jobject thisThread,
   oop threadObj = JNIHandles::resolve(theThread);
   thread->set_vthread(threadObj);
 
-  // Set lock id of new current Thread
-  thread->set_lock_id(java_lang_Thread::thread_id(threadObj));
+  // Set _monitor_owner_id of new current Thread
+  thread->set_monitor_owner_id(java_lang_Thread::thread_id(threadObj));
 
   JFR_ONLY(Jfr::on_set_current_thread(thread, threadObj);)
 JVM_END
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 8df81ca0f94..11481954e10 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1775,14 +1775,20 @@ bool Arguments::sun_java_launcher_is_altjvm() {
 //===========================================================================================================
 // Parsing of main arguments
 
-unsigned int addreads_count = 0;
-unsigned int addexports_count = 0;
-unsigned int addopens_count = 0;
-unsigned int patch_mod_count = 0;
-unsigned int enable_native_access_count = 0;
+static unsigned int addreads_count = 0;
+static unsigned int addexports_count = 0;
+static unsigned int addopens_count = 0;
+static unsigned int patch_mod_count = 0;
+static unsigned int enable_native_access_count = 0;
+static bool patch_mod_javabase = false;
 
 // Check the consistency of vm_init_args
 bool Arguments::check_vm_args_consistency() {
+  // This may modify compiler flags. Must be called before CompilerConfig::check_args_consistency()
+  if (!CDSConfig::check_vm_args_consistency(patch_mod_javabase, mode_flag_cmd_line)) {
+    return false;
+  }
+
   // Method for adding checks for flag consistency.
   // The intent is to warn the user of all possible conflicts,
   // before returning an error.
@@ -1953,8 +1959,6 @@ jint Arguments::parse_vm_init_args(const JavaVMInitArgs *vm_options_args,
                                    const JavaVMInitArgs *java_tool_options_args,
                                    const JavaVMInitArgs *java_options_args,
                                    const JavaVMInitArgs *cmd_line_args) {
-  bool patch_mod_javabase = false;
-
   // Save default settings for some mode flags
   Arguments::_AlwaysCompileLoopMethods = AlwaysCompileLoopMethods;
   Arguments::_UseOnStackReplacement    = UseOnStackReplacement;
@@ -1968,27 +1972,27 @@ jint Arguments::parse_vm_init_args(const JavaVMInitArgs *vm_options_args,
   set_mode_flags(_mixed);
 
   // Parse args structure generated from java.base vm options resource
-  jint result = parse_each_vm_init_arg(vm_options_args, &patch_mod_javabase, JVMFlagOrigin::JIMAGE_RESOURCE);
+  jint result = parse_each_vm_init_arg(vm_options_args, JVMFlagOrigin::JIMAGE_RESOURCE);
   if (result != JNI_OK) {
     return result;
   }
 
   // Parse args structure generated from JAVA_TOOL_OPTIONS environment
   // variable (if present).
-  result = parse_each_vm_init_arg(java_tool_options_args, &patch_mod_javabase, JVMFlagOrigin::ENVIRON_VAR);
+  result = parse_each_vm_init_arg(java_tool_options_args, JVMFlagOrigin::ENVIRON_VAR);
   if (result != JNI_OK) {
     return result;
   }
 
   // Parse args structure generated from the command line flags.
-  result = parse_each_vm_init_arg(cmd_line_args, &patch_mod_javabase, JVMFlagOrigin::COMMAND_LINE);
+  result = parse_each_vm_init_arg(cmd_line_args, JVMFlagOrigin::COMMAND_LINE);
   if (result != JNI_OK) {
     return result;
   }
 
   // Parse args structure generated from the _JAVA_OPTIONS environment
   // variable (if present) (mimics classic VM)
-  result = parse_each_vm_init_arg(java_options_args, &patch_mod_javabase, JVMFlagOrigin::ENVIRON_VAR);
+  result = parse_each_vm_init_arg(java_options_args, JVMFlagOrigin::ENVIRON_VAR);
   if (result != JNI_OK) {
     return result;
   }
@@ -2009,7 +2013,7 @@ jint Arguments::parse_vm_init_args(const JavaVMInitArgs *vm_options_args,
   SystemMemoryBarrier::initialize();
 
   // Do final processing now that all arguments have been parsed
-  result = finalize_vm_init_args(patch_mod_javabase);
+  result = finalize_vm_init_args();
   if (result != JNI_OK) {
     return result;
   }
@@ -2064,7 +2068,7 @@ static bool valid_jdwp_agent(char *name, bool is_path) {
 }
 #endif
 
-int Arguments::process_patch_mod_option(const char* patch_mod_tail, bool* patch_mod_javabase) {
+int Arguments::process_patch_mod_option(const char* patch_mod_tail) {
   // --patch-module=<module>=<file>(<pathsep><file>)*
   assert(patch_mod_tail != nullptr, "Unexpected null patch-module value");
   // Find the equal sign between the module name and the path specification
@@ -2080,7 +2084,7 @@ int Arguments::process_patch_mod_option(const char* patch_mod_tail, bool* patch_
       memcpy(module_name, patch_mod_tail, module_len);
       *(module_name + module_len) = '\0';
       // The path piece begins one past the module_equal sign
-      add_patch_mod_prefix(module_name, module_equal + 1, patch_mod_javabase);
+      add_patch_mod_prefix(module_name, module_equal + 1);
       FREE_C_HEAP_ARRAY(char, module_name);
       if (!create_numbered_module_property("jdk.module.patch", patch_mod_tail, patch_mod_count++)) {
         return JNI_ENOMEM;
@@ -2146,7 +2150,7 @@ jint Arguments::parse_xss(const JavaVMOption* option, const char* tail, intx* ou
   return JNI_OK;
 }
 
-jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_mod_javabase, JVMFlagOrigin origin) {
+jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin origin) {
   // For match_option to return remaining or value part of option string
   const char* tail;
 
@@ -2273,7 +2277,7 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
       }
     } else if (match_option(option, "--patch-module=", &tail)) {
       // --patch-module=<module>=<file>(<pathsep><file>)*
-      int res = process_patch_mod_option(tail, patch_mod_javabase);
+      int res = process_patch_mod_option(tail);
       if (res != JNI_OK) {
         return res;
       }
@@ -2822,16 +2826,16 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
   return JNI_OK;
 }
 
-void Arguments::add_patch_mod_prefix(const char* module_name, const char* path, bool* patch_mod_javabase) {
+void Arguments::add_patch_mod_prefix(const char* module_name, const char* path) {
   // For java.base check for duplicate --patch-module options being specified on the command line.
   // This check is only required for java.base, all other duplicate module specifications
   // will be checked during module system initialization.  The module system initialization
   // will throw an ExceptionInInitializerError if this situation occurs.
   if (strcmp(module_name, JAVA_BASE_NAME) == 0) {
-    if (*patch_mod_javabase) {
+    if (patch_mod_javabase) {
       vm_exit_during_initialization("Cannot specify " JAVA_BASE_NAME " more than once to --patch-module");
     } else {
-      *patch_mod_javabase = true;
+      patch_mod_javabase = true;
     }
   }
 
@@ -2883,7 +2887,7 @@ void Arguments::fix_appclasspath() {
   }
 }
 
-jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
+jint Arguments::finalize_vm_init_args() {
   // check if the default lib/endorsed directory exists; if so, error
   char path[JVM_MAXPATHLEN];
   const char* fileSep = os::file_separator();
@@ -2957,9 +2961,6 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
     return JNI_ERR;
   }
 
-  if (!CDSConfig::check_vm_args_consistency(patch_mod_javabase, mode_flag_cmd_line)) {
-    return JNI_ERR;
-  }
 
 #ifndef CAN_SHOW_REGISTERS_ON_ASSERT
   UNSUPPORTED_OPTION(ShowRegistersOnAssert);
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
index cac0296b327..f18e44bbb55 100644
--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
@@ -290,7 +290,7 @@ class Arguments : AllStatic {
   static bool create_module_property(const char* prop_name, const char* prop_value, PropertyInternal internal);
   static bool create_numbered_module_property(const char* prop_base_name, const char* prop_value, unsigned int count);
 
-  static int process_patch_mod_option(const char* patch_mod_tail, bool* patch_mod_javabase);
+  static int process_patch_mod_option(const char* patch_mod_tail);
 
   // Aggressive optimization flags.
   static jint set_aggressive_opts_flags();
@@ -325,8 +325,8 @@ class Arguments : AllStatic {
                                  const JavaVMInitArgs *java_tool_options_args,
                                  const JavaVMInitArgs *java_options_args,
                                  const JavaVMInitArgs *cmd_line_args);
-  static jint parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_mod_javabase, JVMFlagOrigin origin);
-  static jint finalize_vm_init_args(bool patch_mod_javabase);
+  static jint parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin origin);
+  static jint finalize_vm_init_args();
   static bool is_bad_option(const JavaVMOption* option, jboolean ignore, const char* option_type);
 
   static bool is_bad_option(const JavaVMOption* option, jboolean ignore) {
@@ -474,7 +474,7 @@ class Arguments : AllStatic {
   static void set_ext_dirs(char *value)     { _ext_dirs = os::strdup_check_oom(value); }
 
   // Set up the underlying pieces of the boot class path
-  static void add_patch_mod_prefix(const char *module_name, const char *path, bool* patch_mod_javabase);
+  static void add_patch_mod_prefix(const char *module_name, const char *path);
   static void set_boot_class_path(const char *value, bool has_jimage) {
     // During start up, set by os::set_boot_path()
     assert(get_boot_class_path() == nullptr, "Boot class path previously set");
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index 18beb10f0b4..a6c8e64e55e 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -256,7 +256,9 @@ class Config {
   using OopT = std::conditional_t<oops == oop_kind::NARROW, narrowOop, oop>;
 
   static freeze_result freeze(JavaThread* thread, intptr_t* const sp) {
-    return freeze_internal<SelfT, false>(thread, sp);
+    freeze_result res = freeze_internal<SelfT, false>(thread, sp);
+    JFR_ONLY(assert((res == freeze_ok) || (res == thread->last_freeze_fail_result()), "freeze failure not set"));
+    return res;
   }
 
   static freeze_result freeze_preempt(JavaThread* thread, intptr_t* const sp) {
@@ -1722,6 +1724,9 @@ static inline freeze_result freeze_internal(JavaThread* current, intptr_t* const
     log_develop_debug(continuations)("PINNED due to critical section/hold monitor");
     verify_continuation(cont.continuation());
     freeze_result res = entry->is_pinned() ? freeze_pinned_cs : freeze_pinned_monitor;
+    if (!preempt) {
+      JFR_ONLY(current->set_last_freeze_fail_result(res);)
+    }
     log_develop_trace(continuations)("=== end of freeze (fail %d)", res);
     // Avoid Thread.yield() loops without safepoint polls.
     if (SafepointMechanism::should_process(current) && !preempt) {
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index fd9f75c41b4..7f332638ee0 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -236,8 +236,8 @@ void JavaThread::allocate_threadObj(Handle thread_group, const char* thread_name
   // constructor calls Thread.current(), which must be set here.
   java_lang_Thread::set_thread(thread_oop(), this);
   set_threadOopHandles(thread_oop());
-  // Set the lock_id to the next thread_id temporarily while initialization runs.
-  set_lock_id(ThreadIdentifier::next());
+  // Set the _monitor_owner_id to the next thread_id temporarily while initialization runs.
+  set_monitor_owner_id(ThreadIdentifier::next());
 
   JavaValue result(T_VOID);
   if (thread_name != nullptr) {
@@ -263,8 +263,8 @@ void JavaThread::allocate_threadObj(Handle thread_group, const char* thread_name
                             Handle(),
                             CHECK);
   }
-  // Update the lock_id with the tid value.
-  set_lock_id(java_lang_Thread::thread_id(thread_oop()));
+  // Update the _monitor_owner_id with the tid value.
+  set_monitor_owner_id(java_lang_Thread::thread_id(thread_oop()));
 
   os::set_priority(this, NormPriority);
 
@@ -435,7 +435,7 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _current_waiting_monitor(nullptr),
   _active_handles(nullptr),
   _free_handle_block(nullptr),
-  _lock_id(0),
+  _monitor_owner_id(0),
 
   _suspend_flags(0),
 
@@ -518,6 +518,10 @@ JavaThread::JavaThread(MemTag mem_tag) :
 
   _SleepEvent(ParkEvent::Allocate(this)),
 
+#if INCLUDE_JFR
+  _last_freeze_fail_result(freeze_ok),
+#endif
+
   _lock_stack(this),
   _om_cache(this) {
   set_jni_functions(jni_functions());
@@ -1540,8 +1544,7 @@ void JavaThread::print_on(outputStream *st, bool print_extended_info) const {
   st->print_cr("[" INTPTR_FORMAT "]", (intptr_t)last_Java_sp() & ~right_n_bits(12));
   if (thread_oop != nullptr) {
     if (is_vthread_mounted()) {
-      // _lock_id is the thread ID of the mounted virtual thread
-      st->print_cr("   Carrying virtual thread #" INT64_FORMAT, lock_id());
+      st->print_cr("   Carrying virtual thread #" INT64_FORMAT, java_lang_Thread::thread_id(vthread()));
     } else {
       st->print_cr("   java.lang.Thread.State: %s", java_lang_Thread::thread_status_name(thread_oop));
     }
@@ -1725,7 +1728,7 @@ void JavaThread::prepare(jobject jni_thread, ThreadPriority prio) {
   assert(InstanceKlass::cast(thread_oop->klass())->is_linked(),
          "must be initialized");
   set_threadOopHandles(thread_oop());
-  set_lock_id(java_lang_Thread::thread_id(thread_oop()));
+  set_monitor_owner_id(java_lang_Thread::thread_id(thread_oop()));
 
   if (prio == NoPriority) {
     prio = java_lang_Thread::priority(thread_oop());
@@ -2230,7 +2233,7 @@ void JavaThread::start_internal_daemon(JavaThread* current, JavaThread* target,
 
   // Now bind the thread_oop to the target JavaThread.
   target->set_threadOopHandles(thread_oop());
-  target->set_lock_id(java_lang_Thread::thread_id(thread_oop()));
+  target->set_monitor_owner_id(java_lang_Thread::thread_id(thread_oop()));
 
   Threads::add(target); // target is now visible for safepoint/handshake
   // Publish the JavaThread* in java.lang.Thread after the JavaThread* is
@@ -2361,4 +2364,4 @@ void JavaThread::post_vthread_pinned_event(EventVirtualThreadPinned* event, cons
     event->commit();
   }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index e24138583b8..9a74a6248d0 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -166,14 +166,14 @@ class JavaThread: public Thread {
   // ID used as owner for inflated monitors. Same as the j.l.Thread.tid of the
   // current _vthread object, except during creation of the primordial and JNI
   // attached thread cases where this field can have a temporary value.
-  int64_t _lock_id;
+  int64_t _monitor_owner_id;
 
  public:
-  void set_lock_id(int64_t tid) {
-    assert(tid >= ThreadIdentifier::initial() && tid < ThreadIdentifier::current(), "invalid tid");
-    _lock_id = tid;
+  void set_monitor_owner_id(int64_t id) {
+    assert(id >= ThreadIdentifier::initial() && id < ThreadIdentifier::current(), "");
+    _monitor_owner_id = id;
   }
-  int64_t lock_id() const { return _lock_id; }
+  int64_t monitor_owner_id() const { return _monitor_owner_id; }
 
   // For tracking the heavyweight monitor the thread is pending on.
   ObjectMonitor* current_pending_monitor() {
@@ -884,7 +884,7 @@ class JavaThread: public Thread {
   static ByteSize doing_unsafe_access_offset() { return byte_offset_of(JavaThread, _doing_unsafe_access); }
   NOT_PRODUCT(static ByteSize requires_cross_modify_fence_offset()  { return byte_offset_of(JavaThread, _requires_cross_modify_fence); })
 
-  static ByteSize lock_id_offset()            { return byte_offset_of(JavaThread, _lock_id); }
+  static ByteSize monitor_owner_id_offset()   { return byte_offset_of(JavaThread, _monitor_owner_id); }
 
   static ByteSize cont_entry_offset()         { return byte_offset_of(JavaThread, _cont_entry); }
   static ByteSize cont_fastpath_offset()      { return byte_offset_of(JavaThread, _cont_fastpath); }
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 82473489f68..c95fb5d5f0c 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -124,7 +124,7 @@ ParkEvent* ObjectMonitor::_vthread_unparker_ParkEvent = nullptr;
 //
 // * A thread acquires ownership of a monitor by successfully
 //   CAS()ing the _owner field from NO_OWNER/DEFLATER_MARKER to
-//   its tid (return value from owner_from()).
+//   its owner_id (return value from owner_id_from()).
 //
 // * Invariant: A thread appears on at most one monitor list --
 //   cxq, EntryList or WaitSet -- at any one time.
@@ -331,7 +331,7 @@ bool ObjectMonitor::TryLockWithContentionMark(JavaThread* locking_thread, Object
   if (prev_owner == NO_OWNER) {
     assert(_recursions == 0, "invariant");
     success = true;
-  } else if (prev_owner == owner_from(locking_thread)) {
+  } else if (prev_owner == owner_id_from(locking_thread)) {
     _recursions++;
     success = true;
   } else if (prev_owner == DEFLATER_MARKER) {
@@ -1548,7 +1548,7 @@ void ObjectMonitor::ExitEpilog(JavaThread* current, ObjectWaiter* Wakee) {
 }
 
 // Exits the monitor returning recursion count. _owner should
-// be set to current's tid, i.e. no ANONYMOUS_OWNER allowed.
+// be set to current's owner_id, i.e. no ANONYMOUS_OWNER allowed.
 intx ObjectMonitor::complete_exit(JavaThread* current) {
   assert(InitDone, "Unexpectedly not initialized");
   guarantee(has_owner(current), "complete_exit not owner");
@@ -1580,7 +1580,7 @@ intx ObjectMonitor::complete_exit(JavaThread* current) {
 bool ObjectMonitor::check_owner(TRAPS) {
   JavaThread* current = THREAD;
   int64_t cur = owner_raw();
-  if (cur == owner_from(current)) {
+  if (cur == owner_id_from(current)) {
     return true;
   }
   THROW_MSG_(vmSymbols::java_lang_IllegalMonitorStateException(),
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index c205eedf684..cf364cc012d 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -170,7 +170,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   static const int64_t ANONYMOUS_OWNER = 1;
   static const int64_t DEFLATER_MARKER = 2;
 
-  int64_t volatile _owner;  // Either tid of owner, NO_OWNER, ANONYMOUS_OWNER or DEFLATER_MARKER.
+  int64_t volatile _owner;  // Either owner_id of owner, NO_OWNER, ANONYMOUS_OWNER or DEFLATER_MARKER.
   volatile uint64_t _previous_owner_tid;  // thread id of the previous owner of the monitor
   // Separate _owner and _next_om on different cache lines since
   // both can have busy multi-threaded access. _previous_owner_tid is only
@@ -284,25 +284,25 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   int64_t   owner_raw() const;
 
   // These methods return the value we set in _owner when acquiring
-  // the monitor with the given thread/vthread (tid).
-  static int64_t owner_from(JavaThread* thread);
-  static int64_t owner_from(oop vthread);
+  // the monitor with the given thread/vthread, AKA owner_id.
+  static int64_t owner_id_from(JavaThread* thread);
+  static int64_t owner_id_from(oop vthread);
 
   // Returns true if owner field == DEFLATER_MARKER and false otherwise.
   bool      owner_is_DEFLATER_MARKER() const;
   // Returns true if 'this' is being async deflated and false otherwise.
   bool      is_being_async_deflated();
-  // Clear _owner field; current value must match thread's tid.
+  // Clear _owner field; current value must match thread's owner_id.
   void      release_clear_owner(JavaThread* thread);
   // Simply set _owner field to new_value; current value must match old_value.
   void      set_owner_from_raw(int64_t old_value, int64_t new_value);
-  // Same as above but uses tid of current as new value.
+  // Same as above but uses owner_id of current as new value.
   void      set_owner_from(int64_t old_value, JavaThread* current);
   // Try to set _owner field to new_value if the current value matches
   // old_value, using Atomic::cmpxchg(). Otherwise, does not change the
   // _owner field. Returns the prior value of the _owner field.
   int64_t   try_set_owner_from_raw(int64_t old_value, int64_t new_value);
-  // Same as above but uses tid of current as new_value.
+  // Same as above but uses owner_id of current as new_value.
   int64_t   try_set_owner_from(int64_t old_value, JavaThread* current);
 
   // Methods to check and set _succ. The successor is the thread selected
@@ -316,11 +316,11 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   void      clear_successor();
   int64_t   successor() const;
 
-  // Returns true if _owner field == tid of thread, false otherwise.
-  bool has_owner(JavaThread* thread) const { return owner() == owner_from(thread); }
-  // Set _owner field to tid of thread; current value must be NO_OWNER.
+  // Returns true if _owner field == owner_id of thread, false otherwise.
+  bool has_owner(JavaThread* thread) const { return owner() == owner_id_from(thread); }
+  // Set _owner field to owner_id of thread; current value must be NO_OWNER.
   void set_owner(JavaThread* thread) { set_owner_from(NO_OWNER, thread); }
-  // Try to set _owner field from NO_OWNER to tid of thread.
+  // Try to set _owner field from NO_OWNER to owner_id of thread.
   bool try_set_owner(JavaThread* thread) {
     return try_set_owner_from(NO_OWNER, thread) == NO_OWNER;
   }
diff --git a/src/hotspot/share/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp
index 64e233a1ff5..ed34af8dca3 100644
--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp
@@ -39,16 +39,16 @@
 #include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-inline int64_t ObjectMonitor::owner_from(JavaThread* thread) {
-  int64_t tid = thread->lock_id();
-  assert(tid >= ThreadIdentifier::initial() && tid < ThreadIdentifier::current(), "must be reasonable");
-  return tid;
+inline int64_t ObjectMonitor::owner_id_from(JavaThread* thread) {
+  int64_t id = thread->monitor_owner_id();
+  assert(id >= ThreadIdentifier::initial() && id < ThreadIdentifier::current(), "must be reasonable");
+  return id;
 }
 
-inline int64_t ObjectMonitor::owner_from(oop vthread) {
-  int64_t tid = java_lang_Thread::thread_id(vthread);
-  assert(tid >= ThreadIdentifier::initial() && tid < ThreadIdentifier::current(), "must be reasonable");
-  return tid;
+inline int64_t ObjectMonitor::owner_id_from(oop vthread) {
+  int64_t id = java_lang_Thread::thread_id(vthread);
+  assert(id >= ThreadIdentifier::initial() && id < ThreadIdentifier::current(), "must be reasonable");
+  return id;
 }
 
 inline bool ObjectMonitor::is_entered(JavaThread* current) const {
@@ -153,7 +153,7 @@ inline void ObjectMonitor::set_recursions(size_t recursions) {
 
 // Clear _owner field; current value must match old_value.
 inline void ObjectMonitor::release_clear_owner(JavaThread* old_owner) {
-  int64_t old_value = owner_from(old_owner);
+  int64_t old_value = owner_id_from(old_owner);
 #ifdef ASSERT
   int64_t prev = Atomic::load(&_owner);
   assert(prev == old_value, "unexpected prev owner=" INT64_FORMAT
@@ -182,7 +182,7 @@ inline void ObjectMonitor::set_owner_from_raw(int64_t old_value, int64_t new_val
 }
 
 inline void ObjectMonitor::set_owner_from(int64_t old_value, JavaThread* current) {
-  set_owner_from_raw(old_value, owner_from(current));
+  set_owner_from_raw(old_value, owner_id_from(current));
 }
 
 // Try to set _owner field to new_value if the current value matches
@@ -201,7 +201,7 @@ inline int64_t ObjectMonitor::try_set_owner_from_raw(int64_t old_value, int64_t
 }
 
 inline int64_t ObjectMonitor::try_set_owner_from(int64_t old_value, JavaThread* current) {
-  return try_set_owner_from_raw(old_value, owner_from(current));
+  return try_set_owner_from_raw(old_value, owner_id_from(current));
 }
 
 inline bool ObjectMonitor::has_successor() const {
@@ -209,11 +209,11 @@ inline bool ObjectMonitor::has_successor() const {
 }
 
 inline bool ObjectMonitor::has_successor(JavaThread* thread) const {
-  return owner_from(thread) == Atomic::load(&_succ);
+  return owner_id_from(thread) == Atomic::load(&_succ);
 }
 
 inline void ObjectMonitor::set_successor(JavaThread* thread) {
-  Atomic::store(&_succ, owner_from(thread));
+  Atomic::store(&_succ, owner_id_from(thread));
 }
 
 inline void ObjectMonitor::set_successor(oop vthread) {
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index cba1918529c..941309ca2ac 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -1243,13 +1243,13 @@ void ObjectSynchronizer::owned_monitors_iterate_filtered(MonitorClosure* closure
 // Iterate ObjectMonitors where the owner == thread; this does NOT include
 // ObjectMonitors where owner is set to a stack-lock address in thread.
 void ObjectSynchronizer::owned_monitors_iterate(MonitorClosure* closure, JavaThread* thread) {
-  int64_t key = ObjectMonitor::owner_from(thread);
+  int64_t key = ObjectMonitor::owner_id_from(thread);
   auto thread_filter = [&](ObjectMonitor* monitor) { return monitor->owner() == key; };
   return owned_monitors_iterate_filtered(closure, thread_filter);
 }
 
 void ObjectSynchronizer::owned_monitors_iterate(MonitorClosure* closure, oop vthread) {
-  int64_t key = ObjectMonitor::owner_from(vthread);
+  int64_t key = ObjectMonitor::owner_id_from(vthread);
   auto thread_filter = [&](ObjectMonitor* monitor) { return monitor->owner() == key; };
   return owned_monitors_iterate_filtered(closure, thread_filter);
 }
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index f6b7b7956e2..7b39161090d 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -171,7 +171,7 @@ static void create_initial_thread(Handle thread_group, JavaThread* thread,
 
   DEBUG_ONLY(int64_t main_thread_tid = java_lang_Thread::thread_id(thread_oop());)
   assert(main_thread_tid == ThreadIdentifier::initial(), "");
-  assert(main_thread_tid == thread->lock_id(), "");
+  assert(main_thread_tid == thread->monitor_owner_id(), "");
   JFR_ONLY(assert(JFR_JVM_THREAD_ID(thread) == static_cast<traceid>(main_thread_tid), "initial tid mismatch");)
 
   // Set thread status to running since main thread has
@@ -548,9 +548,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   main_thread->set_active_handles(JNIHandleBlock::allocate_block());
   MACOS_AARCH64_ONLY(main_thread->init_wx());
 
-  // Set the lock_id now since we will run Java code before the Thread instance
+  // Set the _monitor_owner_id now since we will run Java code before the Thread instance
   // is even created. The same value will be assigned to the Thread instance on init.
-  main_thread->set_lock_id(ThreadIdentifier::next());
+  main_thread->set_monitor_owner_id(ThreadIdentifier::next());
 
   if (!Thread::set_as_starting_thread(main_thread)) {
     vm_shutdown_during_initialization(
@@ -1360,8 +1360,7 @@ void Threads::print_on(outputStream* st, bool print_stacks,
       } else {
         p->print_stack_on(st);
         if (p->is_vthread_mounted()) {
-          // _lock_id is the thread ID of the mounted virtual thread
-          st->print_cr("   Mounted virtual thread #" INT64_FORMAT, p->lock_id());
+          st->print_cr("   Mounted virtual thread #" INT64_FORMAT, java_lang_Thread::thread_id(p->vthread()));
           p->print_vthread_stack_on(st);
         }
       }
diff --git a/src/hotspot/share/runtime/vmOperations.cpp b/src/hotspot/share/runtime/vmOperations.cpp
index 1f5d63a917e..a3f632ca496 100644
--- a/src/hotspot/share/runtime/vmOperations.cpp
+++ b/src/hotspot/share/runtime/vmOperations.cpp
@@ -368,7 +368,7 @@ class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
 
   // Implements the ObjectMonitorsView interface
   void visit(MonitorClosure* closure, JavaThread* thread) override {
-    int64_t key = ObjectMonitor::owner_from(thread);
+    int64_t key = ObjectMonitor::owner_id_from(thread);
     ObjectMonitorLinkedList* list = get_list(key);
     LinkedListIterator<ObjectMonitor*> iter(list != nullptr ? list->head() : nullptr);
     while (!iter.is_empty()) {
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 6fa57acf3ce..eaf259cedba 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -664,7 +664,7 @@
   nonstatic_field(JavaThread,                  _vframe_array_head,                            vframeArray*)                          \
   nonstatic_field(JavaThread,                  _vframe_array_last,                            vframeArray*)                          \
   nonstatic_field(JavaThread,                  _active_handles,                               JNIHandleBlock*)                       \
-  nonstatic_field(JavaThread,                  _lock_id,                                      int64_t)                               \
+  nonstatic_field(JavaThread,                  _monitor_owner_id,                             int64_t)                               \
   volatile_nonstatic_field(JavaThread,         _terminated,                                   JavaThread::TerminatedTypes)           \
   nonstatic_field(Thread,                      _osthread,                                     OSThread*)                             \
   nonstatic_field(Thread,                      _resource_area,                                ResourceArea*)                         \
diff --git a/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemController.java b/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemController.java
index 38be8628fb4..17bc60ef863 100644
--- a/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemController.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemController.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, 2022, Red Hat Inc.
+ * 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
@@ -28,8 +29,8 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.math.BigInteger;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -61,13 +62,13 @@ public interface CgroupSubsystemController {
     public static String getStringValue(CgroupSubsystemController controller, String param) {
         if (controller == null) return null;
 
-        try {
-            return CgroupUtil.readStringValue(controller, param);
-        }
-        catch (IOException e) {
+        Path filePath = Path.of(controller.path(), param);
+        try (Stream<String> lines = Files.lines(filePath)) {
+            Optional<String> firstLine = lines.findFirst();
+            return firstLine.orElse(null);
+        } catch (UncheckedIOException | IOException e) {
             return null;
         }
-
     }
 
     /**
@@ -92,8 +93,8 @@ public static long getLongValueMatchingLine(CgroupSubsystemController controller
             return retval;
         }
         try {
-            Path filePath = Paths.get(controller.path(), param);
-            List<String> lines = CgroupUtil.readAllLinesPrivileged(filePath);
+            Path filePath = Path.of(controller.path(), param);
+            List<String> lines = Files.readAllLines(filePath);
             for (String line : lines) {
                 if (line.startsWith(match)) {
                     retval = conversion.apply(line);
@@ -161,7 +162,7 @@ public static double getDoubleValue(CgroupSubsystemController controller, String
     public static long getLongEntry(CgroupSubsystemController controller, String param, String entryname, long defaultRetval) {
         if (controller == null) return defaultRetval;
 
-        try (Stream<String> lines = CgroupUtil.readFilePrivileged(Paths.get(controller.path(), param))) {
+        try (Stream<String> lines = Files.lines(Path.of(controller.path(), param))) {
 
             Optional<String> result = lines.map(line -> line.split(" "))
                                            .filter(line -> (line.length == 2 &&
diff --git a/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java b/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java
index 0a6d9958d11..d963c46f079 100644
--- a/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, 2022, Red Hat Inc.
+ * 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
@@ -29,8 +30,8 @@
 import java.io.UncheckedIOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -140,7 +141,7 @@ public static Optional<CgroupTypeResult> determineType(String mountInfo,
                                                            String cgroups,
                                                            String selfCgroup) throws IOException {
         final Map<String, CgroupInfo> infos = new HashMap<>();
-        List<String> lines = CgroupUtil.readAllLinesPrivileged(Paths.get(cgroups));
+        List<String> lines = Files.readAllLines(Path.of(cgroups));
         for (String line : lines) {
             if (line.startsWith("#")) {
                 continue;
@@ -180,7 +181,7 @@ public static Optional<CgroupTypeResult> determineType(String mountInfo,
         // However, continuing in that case does not make sense as we'd need
         // information from mountinfo for the mounted controller paths which we wouldn't
         // find anyway in that case.
-        lines = CgroupUtil.readAllLinesPrivileged(Paths.get(mountInfo));
+        lines = Files.readAllLines(Path.of(mountInfo));
         boolean anyCgroupMounted = false;
         for (String line: lines) {
             boolean cgroupsControllerFound = amendCgroupInfos(line, infos, isCgroupsV2);
@@ -196,8 +197,7 @@ public static Optional<CgroupTypeResult> determineType(String mountInfo,
         // See:
         //   setCgroupV1Path() for the action run for cgroups v1 systems
         //   setCgroupV2Path() for the action run for cgroups v2 systems
-        try (Stream<String> selfCgroupLines =
-             CgroupUtil.readFilePrivileged(Paths.get(selfCgroup))) {
+        try (Stream<String> selfCgroupLines = Files.lines(Path.of(selfCgroup))) {
             Consumer<String[]> action = (tokens -> setCgroupV1Path(infos, tokens));
             if (isCgroupsV2) {
                 action = (tokens -> setCgroupV2Path(infos, tokens));
@@ -311,7 +311,7 @@ private static boolean amendCgroupInfos(String mntInfoLine,
             String mountPath = lineMatcher.group(2);
             String fsType = lineMatcher.group(3);
             if (fsType.equals("cgroup")) {
-                Path p = Paths.get(mountPath);
+                Path p = Path.of(mountPath);
                 String[] controllerNames = p.getFileName().toString().split(",");
                 for (String controllerName: controllerNames) {
                     switch (controllerName) {
diff --git a/src/java.base/linux/classes/jdk/internal/platform/CgroupUtil.java b/src/java.base/linux/classes/jdk/internal/platform/CgroupUtil.java
deleted file mode 100644
index dbe8a85b2b2..00000000000
--- a/src/java.base/linux/classes/jdk/internal/platform/CgroupUtil.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.platform;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.List;
-import java.util.stream.Stream;
-
-public final class CgroupUtil {
-
-    @SuppressWarnings("removal")
-    public static Stream<String> readFilePrivileged(Path path) throws IOException {
-        try {
-            PrivilegedExceptionAction<Stream<String>> pea = () -> Files.lines(path);
-            return AccessController.doPrivileged(pea);
-        } catch (PrivilegedActionException e) {
-            unwrapIOExceptionAndRethrow(e);
-            throw new InternalError(e.getCause());
-        } catch (UncheckedIOException e) {
-            throw e.getCause();
-        }
-    }
-
-    static void unwrapIOExceptionAndRethrow(PrivilegedActionException pae) throws IOException {
-        Throwable x = pae.getCause();
-        if (x instanceof IOException)
-            throw (IOException) x;
-        if (x instanceof RuntimeException)
-            throw (RuntimeException) x;
-        if (x instanceof Error)
-            throw (Error) x;
-    }
-
-    static String readStringValue(CgroupSubsystemController controller, String param) throws IOException {
-        PrivilegedExceptionAction<BufferedReader> pea = () ->
-                Files.newBufferedReader(Paths.get(controller.path(), param));
-        try (@SuppressWarnings("removal") BufferedReader bufferedReader =
-                     AccessController.doPrivileged(pea)) {
-            String line = bufferedReader.readLine();
-            return line;
-        } catch (PrivilegedActionException e) {
-            unwrapIOExceptionAndRethrow(e);
-            throw new InternalError(e.getCause());
-        } catch (UncheckedIOException e) {
-            throw e.getCause();
-        }
-    }
-
-    @SuppressWarnings("removal")
-    public static List<String> readAllLinesPrivileged(Path path) throws IOException {
-        try {
-            PrivilegedExceptionAction<List<String>> pea = () -> Files.readAllLines(path);
-            return AccessController.doPrivileged(pea);
-        } catch (PrivilegedActionException e) {
-            unwrapIOExceptionAndRethrow(e);
-            throw new InternalError(e.getCause());
-        } catch (UncheckedIOException e) {
-            throw e.getCause();
-        }
-    }
-}
diff --git a/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java b/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
index ddb4d8e2718..aa618766b38 100644
--- a/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, 2022, Red Hat Inc.
+ * 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
@@ -27,15 +28,16 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.file.Paths;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import jdk.internal.platform.CgroupInfo;
 import jdk.internal.platform.CgroupSubsystem;
 import jdk.internal.platform.CgroupSubsystemController;
-import jdk.internal.platform.CgroupUtil;
 
 public class CgroupV2Subsystem implements CgroupSubsystem {
 
@@ -328,10 +330,9 @@ public long getBlkIOServiced() {
     }
 
     private long sumTokensIOStat(Function<String, Long> mapFunc) {
-        try {
-            return CgroupUtil.readFilePrivileged(Paths.get(unified.path(), "io.stat"))
-                                .map(mapFunc)
-                                .collect(Collectors.summingLong(e -> e));
+        try (Stream<String> lines = Files.lines(Path.of(unified.path(), "io.stat"))) {
+            return lines.map(mapFunc)
+                        .collect(Collectors.summingLong(e -> e));
         } catch (UncheckedIOException | IOException e) {
             return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
index 40bbc6c56cc..9808a013303 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
@@ -71,249 +71,6 @@ public final class ML_KEM {
             -1599, -709, -789, -1317, -57, 1049, -584
     };
 
-    private static final short[] MONT_ZETAS_FOR_VECTOR_NTT_ARR = new short[]{
-            // level 0
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            -758, -758, -758, -758, -758, -758, -758, -758,
-            // level 1
-            -359, -359, -359, -359, -359, -359, -359, -359,
-            -359, -359, -359, -359, -359, -359, -359, -359,
-            -359, -359, -359, -359, -359, -359, -359, -359,
-            -359, -359, -359, -359, -359, -359, -359, -359,
-            -359, -359, -359, -359, -359, -359, -359, -359,
-            -359, -359, -359, -359, -359, -359, -359, -359,
-            -359, -359, -359, -359, -359, -359, -359, -359,
-            -359, -359, -359, -359, -359, -359, -359, -359,
-            -1517, -1517, -1517, -1517, -1517, -1517, -1517, -1517,
-            -1517, -1517, -1517, -1517, -1517, -1517, -1517, -1517,
-            -1517, -1517, -1517, -1517, -1517, -1517, -1517, -1517,
-            -1517, -1517, -1517, -1517, -1517, -1517, -1517, -1517,
-            -1517, -1517, -1517, -1517, -1517, -1517, -1517, -1517,
-            -1517, -1517, -1517, -1517, -1517, -1517, -1517, -1517,
-            -1517, -1517, -1517, -1517, -1517, -1517, -1517, -1517,
-            -1517, -1517, -1517, -1517, -1517, -1517, -1517, -1517,
-            // level 2
-            1493, 1493, 1493, 1493, 1493, 1493, 1493, 1493,
-            1493, 1493, 1493, 1493, 1493, 1493, 1493, 1493,
-            1493, 1493, 1493, 1493, 1493, 1493, 1493, 1493,
-            1493, 1493, 1493, 1493, 1493, 1493, 1493, 1493,
-            1422, 1422, 1422, 1422, 1422, 1422, 1422, 1422,
-            1422, 1422, 1422, 1422, 1422, 1422, 1422, 1422,
-            1422, 1422, 1422, 1422, 1422, 1422, 1422, 1422,
-            1422, 1422, 1422, 1422, 1422, 1422, 1422, 1422,
-            287, 287, 287, 287, 287, 287, 287, 287,
-            287, 287, 287, 287, 287, 287, 287, 287,
-            287, 287, 287, 287, 287, 287, 287, 287,
-            287, 287, 287, 287, 287, 287, 287, 287,
-            202, 202, 202, 202, 202, 202, 202, 202,
-            202, 202, 202, 202, 202, 202, 202, 202,
-            202, 202, 202, 202, 202, 202, 202, 202,
-            202, 202, 202, 202, 202, 202, 202, 202,
-            // level 3
-            -171, -171, -171, -171, -171, -171, -171, -171,
-            -171, -171, -171, -171, -171, -171, -171, -171,
-            622, 622, 622, 622, 622, 622, 622, 622,
-            622, 622, 622, 622, 622, 622, 622, 622,
-            1577, 1577, 1577, 1577, 1577, 1577, 1577, 1577,
-            1577, 1577, 1577, 1577, 1577, 1577, 1577, 1577,
-            182, 182, 182, 182, 182, 182, 182, 182,
-            182, 182, 182, 182, 182, 182, 182, 182,
-            962, 962, 962, 962, 962, 962, 962, 962,
-            962, 962, 962, 962, 962, 962, 962, 962,
-            -1202, -1202, -1202, -1202, -1202, -1202, -1202, -1202,
-            -1202, -1202, -1202, -1202, -1202, -1202, -1202, -1202,
-            -1474, -1474, -1474, -1474, -1474, -1474, -1474, -1474,
-            -1474, -1474, -1474, -1474, -1474, -1474, -1474, -1474,
-            1468, 1468, 1468, 1468, 1468, 1468, 1468, 1468,
-            1468, 1468, 1468, 1468, 1468, 1468, 1468, 1468,
-            // level 4
-            573, 573, 573, 573, 573, 573, 573, 573,
-            -1325, -1325, -1325, -1325, -1325, -1325, -1325, -1325,
-            264, 264, 264, 264, 264, 264, 264, 264,
-            383, 383, 383, 383, 383, 383, 383, 383,
-            -829, -829, -829, -829, -829, -829, -829, -829,
-            1458, 1458, 1458, 1458, 1458, 1458, 1458, 1458,
-            -1602, -1602, -1602, -1602, -1602, -1602, -1602, -1602,
-            -130, -130, -130, -130, -130, -130, -130, -130,
-            -681, -681, -681, -681, -681, -681, -681, -681,
-            1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
-            732, 732, 732, 732, 732, 732, 732, 732,
-            608, 608, 608, 608, 608, 608, 608, 608,
-            -1542, -1542, -1542, -1542, -1542, -1542, -1542, -1542,
-            411, 411, 411, 411, 411, 411, 411, 411,
-            -205, -205, -205, -205, -205, -205, -205, -205,
-            -1571, -1571, -1571, -1571, -1571, -1571, -1571, -1571,
-            // level 5
-            1223, 1223, 1223, 1223, 652, 652, 652, 652,
-            -552, -552, -552, -552, 1015, 1015, 1015, 1015,
-            -1293, -1293, -1293, -1293, 1491, 1491, 1491, 1491,
-            -282, -282, -282, -282, -1544, -1544, -1544, -1544,
-            516, 516, 516, 516, -8, -8, -8, -8,
-            -320, -320, -320, -320, -666, -666, -666, -666,
-            1711, 1711, 1711, 1711, -1162, -1162, -1162, -1162,
-            126, 126, 126, 126, 1469, 1469, 1469, 1469,
-            -853, -853, -853, -853, -90, -90, -90, -90,
-            -271, -271, -271, -271, 830, 830, 830, 830,
-            107, 107, 107, 107, -1421, -1421, -1421, -1421,
-            -247, -247, -247, -247, -951, -951, -951, -951,
-            -398, -398, -398, -398, 961, 961, 961, 961,
-            -1508, -1508, -1508, -1508, -725, -725, -725, -725,
-            448, 448, 448, 448, -1065, -1065, -1065, -1065,
-            677, 677, 677, 677, -1275, -1275, -1275, -1275,
-            // level 6
-            -1103, -1103, 430, 430, 555, 555, 843, 843,
-            -1251, -1251, 871, 871, 1550, 1550, 105, 105,
-            422, 422, 587, 587, 177, 177, -235, -235,
-            -291, -291, -460, -460, 1574, 1574, 1653, 1653,
-            -246, -246, 778, 778, 1159, 1159, -147, -147,
-            -777, -777, 1483, 1483, -602, -602, 1119, 1119,
-            -1590, -1590, 644, 644, -872, -872, 349, 349,
-            418, 418, 329, 329, -156, -156, -75, -75,
-            817, 817, 1097, 1097, 603, 603, 610, 610,
-            1322, 1322, -1285, -1285, -1465, -1465, 384, 384,
-            -1215, -1215, -136, -136, 1218, 1218, -1335, -1335,
-            -874, -874, 220, 220, -1187, -1187, 1670, 1670,
-            -1185, -1185, -1530, -1530, -1278, -1278, 794, 794,
-            -1510, -1510, -854, -854, -870, -870, 478, 478,
-            -108, -108, -308, -308, 996, 996, 991, 991,
-            958, 958, -1460, -1460, 1522, 1522, 1628, 1628
-    };
-    private static final short[] MONT_ZETAS_FOR_VECTOR_INVERSE_NTT_ARR = new short[]{
-            // level 0
-            -1628, -1628, -1522, -1522, 1460, 1460, -958, -958,
-            -991, -991, -996, -996, 308, 308, 108, 108,
-            -478, -478, 870, 870, 854, 854, 1510, 1510,
-            -794, -794, 1278, 1278, 1530, 1530, 1185, 1185,
-            1659, 1659, 1187, 1187, -220, -220, 874, 874,
-            1335, 1335, -1218, -1218, 136, 136, 1215, 1215,
-            -384, -384, 1465, 1465, 1285, 1285, -1322, -1322,
-            -610, -610, -603, -603, -1097, -1097, -817, -817,
-            75, 75, 156, 156, -329, -329, -418, -418,
-            -349, -349, 872, 872, -644, -644, 1590, 1590,
-            -1119, -1119, 602, 602, -1483, -1483, 777, 777,
-            147, 147, -1159, -1159, -778, -778, 246, 246,
-            -1653, -1653, -1574, -1574, 460, 460, 291, 291,
-            235, 235, -177, -177, -587, -587, -422, -422,
-            -105, -105, -1550, -1550, -871, -871, 1251, 1251,
-            -843, -843, -555, -555, -430, -430, 1103, 1103,
-            // level 1
-            1275, 1275, 1275, 1275, -677, -677, -677, -677,
-            1065, 1065, 1065, 1065, -448, -448, -448, -448,
-            725, 725, 725, 725, 1508, 1508, 1508, 1508,
-            -961, -961, -961, -961, 398, 398, 398, 398,
-            951, 951, 951, 951, 247, 247, 247, 247,
-            1421, 1421, 1421, 1421, -107, -107, -107, -107,
-            -830, -830, -830, -830, 271, 271, 271, 271,
-            90, 90, 90, 90, 853, 853, 853, 853,
-            -1469, -1469, -1469, -1469, -126, -126, -126, -126,
-            1162, 1162, 1162, 1162, 1618, 1618, 1618, 1618,
-            666, 666, 666, 666, 320, 320, 320, 320,
-            8, 8, 8, 8, -516, -516, -516, -516,
-            1544, 1544, 1544, 1544, 282, 282, 282, 282,
-            -1491, -1491, -1491, -1491, 1293, 1293, 1293, 1293,
-            -1015, -1015, -1015, -1015, 552, 552, 552, 552,
-            -652, -652, -652, -652, -1223, -1223, -1223, -1223,
-            // level 2
-            1571, 1571, 1571, 1571, 1571, 1571, 1571, 1571,
-            205, 205, 205, 205, 205, 205, 205, 205,
-            -411, -411, -411, -411, -411, -411, -411, -411,
-            1542, 1542, 1542, 1542, 1542, 1542, 1542, 1542,
-            -608, -608, -608, -608, -608, -608, -608, -608,
-            -732, -732, -732, -732, -732, -732, -732, -732,
-            -1017, -1017, -1017, -1017, -1017, -1017, -1017, -1017,
-            681, 681, 681, 681, 681, 681, 681, 681,
-            130, 130, 130, 130, 130, 130, 130, 130,
-            1602, 1602, 1602, 1602, 1602, 1602, 1602, 1602,
-            -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
-            829, 829, 829, 829, 829, 829, 829, 829,
-            -383, -383, -383, -383, -383, -383, -383, -383,
-            -264, -264, -264, -264, -264, -264, -264, -264,
-            1325, 1325, 1325, 1325, 1325, 1325, 1325, 1325,
-            -573, -573, -573, -573, -573, -573, -573, -573,
-            // level 3
-            -1468, -1468, -1468, -1468, -1468, -1468, -1468, -1468,
-            -1468, -1468, -1468, -1468, -1468, -1468, -1468, -1468,
-            1474, 1474, 1474, 1474, 1474, 1474, 1474, 1474,
-            1474, 1474, 1474, 1474, 1474, 1474, 1474, 1474,
-            1202, 1202, 1202, 1202, 1202, 1202, 1202, 1202,
-            1202, 1202, 1202, 1202, 1202, 1202, 1202, 1202,
-            -962, -962, -962, -962, -962, -962, -962, -962,
-            -962, -962, -962, -962, -962, -962, -962, -962,
-            -182, -182, -182, -182, -182, -182, -182, -182,
-            -182, -182, -182, -182, -182, -182, -182, -182,
-            -1577, -1577, -1577, -1577, -1577, -1577, -1577, -1577,
-            -1577, -1577, -1577, -1577, -1577, -1577, -1577, -1577,
-            -622, -622, -622, -622, -622, -622, -622, -622,
-            -622, -622, -622, -622, -622, -622, -622, -622,
-            171, 171, 171, 171, 171, 171, 171, 171,
-            171, 171, 171, 171, 171, 171, 171, 171,
-            // level 4
-            -202, -202, -202, -202, -202, -202, -202, -202,
-            -202, -202, -202, -202, -202, -202, -202, -202,
-            -202, -202, -202, -202, -202, -202, -202, -202,
-            -202, -202, -202, -202, -202, -202, -202, -202,
-            -287, -287, -287, -287, -287, -287, -287, -287,
-            -287, -287, -287, -287, -287, -287, -287, -287,
-            -287, -287, -287, -287, -287, -287, -287, -287,
-            -287, -287, -287, -287, -287, -287, -287, -287,
-            -1422, -1422, -1422, -1422, -1422, -1422, -1422, -1422,
-            -1422, -1422, -1422, -1422, -1422, -1422, -1422, -1422,
-            -1422, -1422, -1422, -1422, -1422, -1422, -1422, -1422,
-            -1422, -1422, -1422, -1422, -1422, -1422, -1422, -1422,
-            -1493, -1493, -1493, -1493, -1493, -1493, -1493, -1493,
-            -1493, -1493, -1493, -1493, -1493, -1493, -1493, -1493,
-            -1493, -1493, -1493, -1493, -1493, -1493, -1493, -1493,
-            -1493, -1493, -1493, -1493, -1493, -1493, -1493, -1493,
-            // level 5
-            1517, 1517, 1517, 1517, 1517, 1517, 1517, 1517,
-            1517, 1517, 1517, 1517, 1517, 1517, 1517, 1517,
-            1517, 1517, 1517, 1517, 1517, 1517, 1517, 1517,
-            1517, 1517, 1517, 1517, 1517, 1517, 1517, 1517,
-            1517, 1517, 1517, 1517, 1517, 1517, 1517, 1517,
-            1517, 1517, 1517, 1517, 1517, 1517, 1517, 1517,
-            1517, 1517, 1517, 1517, 1517, 1517, 1517, 1517,
-            1517, 1517, 1517, 1517, 1517, 1517, 1517, 1517,
-            359, 359, 359, 359, 359, 359, 359, 359,
-            359, 359, 359, 359, 359, 359, 359, 359,
-            359, 359, 359, 359, 359, 359, 359, 359,
-            359, 359, 359, 359, 359, 359, 359, 359,
-            359, 359, 359, 359, 359, 359, 359, 359,
-            359, 359, 359, 359, 359, 359, 359, 359,
-            359, 359, 359, 359, 359, 359, 359, 359,
-            359, 359, 359, 359, 359, 359, 359, 359,
-            // level 6
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758,
-            758, 758, 758, 758, 758, 758, 758, 758
-    };
-
     private static final int[] MONT_ZETAS_FOR_NTT_MULT = new int[]{
             -1003, 1003, 222, -222, -1107, 1107, 172, -172,
             -42, 42, 620, -620, 1497, -1497, -1649, 1649,
@@ -333,25 +90,6 @@ public final class ML_KEM {
             -1317, 1317, -57, 57, 1049, -1049, -584, 584
     };
 
-    private static final short[] MONT_ZETAS_FOR_VECTOR_NTT_MULT_ARR = new short[]{
-            -1103, 1103, 430, -430, 555, -555, 843, -843,
-            -1251, 1251, 871, -871, 1550, -1550, 105, -105,
-            422, -422, 587, -587, 177, -177, -235, 235,
-            -291, 291, -460, 460, 1574, -1574, 1653, -1653,
-            -246, 246, 778, -778, 1159, -1159, -147, 147,
-            -777, 777, 1483, -1483, -602, 602, 1119, -1119,
-            -1590, 1590, 644, -644, -872, 872, 349, -349,
-            418, -418, 329, -329, -156, 156, -75, 75,
-            817, -817, 1097, -1097, 603, -603, 610, -610,
-            1322, -1322, -1285, 1285, -1465, 1465, 384, -384,
-            -1215, 1215, -136, 136, 1218, -1218, -1335, 1335,
-            -874, 874, 220, -220, -1187, 1187, 1670, 1659,
-            -1185, 1185, -1530, 1530, -1278, 1278, 794, -794,
-            -1510, 1510, -854, 854, -870, 870, 478, -478,
-            -108, 108, -308, 308, 996, -996, 991, -991,
-            958, -958, -1460, 1460, 1522, -1522, 1628, -1628
-    };
-
     private final int mlKem_k;
     private final int mlKem_eta1;
     private final int mlKem_eta2;
@@ -499,7 +237,7 @@ protected ML_KEM_KeyPair generateKemKeyPair(byte[] kem_d, byte[] kem_z) {
         System.arraycopy(kPkePrivateKey, 0, decapsKey, 0, kPkePrivateKey.length);
         Arrays.fill(kPkePrivateKey, (byte)0);
         System.arraycopy(encapsKey, 0, decapsKey,
-            kPkePrivateKey.length, encapsKey.length);
+                kPkePrivateKey.length, encapsKey.length);
 
         mlKemH.update(encapsKey);
         try {
@@ -534,7 +272,7 @@ protected ML_KEM_EncapsulateResult encapsulate(
         var kHatAndRandomCoins = mlKemG.digest();
         var randomCoins = Arrays.copyOfRange(kHatAndRandomCoins, 32, 64);
         var cipherText = kPkeEncrypt(new K_PKE_EncryptionKey(encapsulationKey.keyBytes),
-            randomMessage, randomCoins);
+                randomMessage, randomCoins);
         Arrays.fill(randomCoins, (byte) 0);
         byte[] sharedSecret = Arrays.copyOfRange(kHatAndRandomCoins, 0, 32);
         Arrays.fill(kHatAndRandomCoins, (byte) 0);
@@ -564,7 +302,7 @@ protected byte[] decapsulate(ML_KEM_DecapsulationKey decapsulationKey,
 
         byte[] kPkePrivateKeyBytes = new byte[mlKem_k * encode12PolyLen];
         System.arraycopy(decapsKeyBytes, 0, kPkePrivateKeyBytes, 0,
-            kPkePrivateKeyBytes.length);
+                kPkePrivateKeyBytes.length);
 
         byte[] encapsKeyBytes = new byte[mlKem_k * encode12PolyLen + 32];
         System.arraycopy(decapsKeyBytes, mlKem_k * encode12PolyLen,
@@ -678,8 +416,8 @@ private K_PKE_KeyPair generateK_PkeKeyPair(byte[] seed) {
                 pkEncoded, (mlKem_k * ML_KEM_N * 12) / 8, rho.length);
 
         return new K_PKE_KeyPair(
-            new K_PKE_EncryptionKey(pkEncoded),
-            new K_PKE_DecryptionKey(skEncoded));
+                new K_PKE_EncryptionKey(pkEncoded),
+                new K_PKE_DecryptionKey(skEncoded));
     }
 
     private K_PKE_CipherText kPkeEncrypt(
@@ -969,11 +707,9 @@ private short[][] mlKemVectorInverseNTT(short[][] vector) {
         return vector;
     }
 
-    static void implMlKemNtt(short[] poly, short[] ntt_zetas) {
-        implMlKemNttJava(poly);
-    }
-
-    private static void implMlKemNttJava(short[] poly) {
+    // The elements of poly should be in the range [-ML_KEM_Q, ML_KEM_Q]
+    // The elements of poly at return will be in the range of [0, ML_KEM_Q]
+    private void mlKemNTT(short[] poly) {
         int[] coeffs = new int[ML_KEM_N];
         for (int m = 0; m < ML_KEM_N; m++) {
             coeffs[m] = poly[m];
@@ -982,20 +718,12 @@ private static void implMlKemNttJava(short[] poly) {
         for (int m = 0; m < ML_KEM_N; m++) {
             poly[m] = (short) coeffs[m];
         }
-    }
-
-    // The elements of poly should be in the range [-ML_KEM_Q, ML_KEM_Q]
-    // The elements of poly at return will be in the range of [0, ML_KEM_Q]
-    private void mlKemNTT(short[] poly) {
-        implMlKemNtt(poly, MONT_ZETAS_FOR_VECTOR_NTT_ARR);
         mlKemBarrettReduce(poly);
     }
 
-    static void implMlKemInverseNtt(short[] poly, short[] zetas) {
-        implMlKemInverseNttJava(poly);
-    }
-
-    private static void implMlKemInverseNttJava(short[] poly) {
+    // Works in place, but also returns its (modified) input so that it can
+    // be used in expressions
+    private short[] mlKemInverseNTT(short[] poly) {
         int[] coeffs = new int[ML_KEM_N];
         for (int m = 0; m < ML_KEM_N; m++) {
             coeffs[m] = poly[m];
@@ -1004,12 +732,6 @@ private static void implMlKemInverseNttJava(short[] poly) {
         for (int m = 0; m < ML_KEM_N; m++) {
             poly[m] = (short) coeffs[m];
         }
-    }
-
-    // Works in place, but also returns its (modified) input so that it can
-    // be used in expressions
-    private short[] mlKemInverseNTT(short[] poly) {
-        implMlKemInverseNtt(poly, MONT_ZETAS_FOR_VECTOR_INVERSE_NTT_ARR);
         return poly;
     }
 
@@ -1100,14 +822,10 @@ private short[] mlKemVectorScalarMult(short[][] a, short[][] b) {
         return result;
     }
 
-    static void implMlKemNttMult(short[] result, short[] ntta, short[] nttb,
-                                short[] zetas) {
-        implMlKemNttMultJava(result, ntta, nttb);
-    }
-
-    private static void implMlKemNttMultJava(short[] result,
-                                             short[] ntta, short[] nttb) {
-
+    // Multiplies two polynomials represented in the NTT domain.
+    // The result is a representation of the product still in the NTT domain.
+    // The coefficients in the result are in the range (-ML_KEM_Q, ML_KEM_Q).
+    private void nttMult(short[] result, short[] ntta, short[] nttb) {
         for (int m = 0; m < ML_KEM_N / 2; m++) {
             int a0 = ntta[2 * m];
             int a1 = ntta[2 * m + 1];
@@ -1121,13 +839,6 @@ private static void implMlKemNttMultJava(short[] result,
         }
     }
 
-    // Multiplies two polynomials represented in the NTT domain.
-    // The result is a representation of the product still in the NTT domain.
-    // The coefficients in the result are in the range (-ML_KEM_Q, ML_KEM_Q).
-    private void nttMult(short[] result, short[] ntta, short[] nttb) {
-        implMlKemNttMult(result, ntta, nttb, MONT_ZETAS_FOR_VECTOR_NTT_MULT_ARR);
-    }
-
     // Adds the vector of polynomials b to a in place, i.e. a will hold
     // the result. It also returns (the modified) a so that it can be used
     // in an expression.
@@ -1142,36 +853,15 @@ private short[][] mlKemAddVec(short[][] a, short[][] b) {
         return a;
     }
 
-    static void implMlKemAddPoly(short[] result, short[] a, short[] b) {
-        implMlKemAddPolyJava(result, a, b);
-    }
-
-    private static void implMlKemAddPolyJava(short[] result, short[] a, short[] b) {
-        for (int m = 0; m < ML_KEM_N; m++) {
-            int r = a[m] + b[m] + ML_KEM_Q; // This makes r > -ML_KEM_Q
-            result[m] = (short) r;
-        }
-    }
-
     // Adds the polynomial b to a in place, i.e. (the modified) a will hold
     // the result.
     // The coefficients are supposed be greater than -ML_KEM_Q in a and
     // greater than -ML_KEM_Q and less than ML_KEM_Q in b.
     // The coefficients in the result are greater than -ML_KEM_Q.
     private void mlKemAddPoly(short[] a, short[] b) {
-        implMlKemAddPoly(a, a, b);
-    }
-
-    static void implMlKemAddPoly(short[] result, short[] a, short[] b, short[] c) {
-        implMlKemAddPolyJava(result, a, b, c);
-    }
-
-    private static void implMlKemAddPolyJava(short[] result, short[] a,
-                                             short[] b, short[] c) {
-
         for (int m = 0; m < ML_KEM_N; m++) {
-            int r = a[m] + b[m] + c[m] + 2 * ML_KEM_Q; // This makes r > - ML_KEM_Q
-            result[m] = (short) r;
+            int r = a[m] + b[m] + ML_KEM_Q; // This makes r > -ML_KEM_Q
+            a[m] = (short) r;
         }
     }
 
@@ -1181,7 +871,10 @@ private static void implMlKemAddPolyJava(short[] result, short[] a,
     // greater than -ML_KEM_Q and less than ML_KEM_Q.
     // The coefficients in the result are nonnegative and less than ML_KEM_Q.
     private short[] mlKemAddPoly(short[] a, short[] b, short[] c) {
-        implMlKemAddPoly(a, a, b, c);
+        for (int m = 0; m < ML_KEM_N; m++) {
+            int r = a[m] + b[m] + c[m] + 2 * ML_KEM_Q; // This makes r > - ML_KEM_Q
+            a[m] = (short) r;
+        }
         mlKemBarrettReduce(a);
         return a;
     }
@@ -1304,23 +997,6 @@ private short[][] decodeVector(int l, byte[] encodedVector) {
         return result;
     }
 
-    private static void implMlKem12To16(byte[] condensed, int index,
-                                        short[] parsed, int parsedLength) {
-
-        implMlKem12To16Java(condensed, index, parsed, parsedLength);
-    }
-
-    private static void implMlKem12To16Java(byte[] condensed, int index,
-                                            short[] parsed, int parsedLength) {
-
-        for (int i = 0; i < parsedLength * 3 / 2; i += 3) {
-            parsed[(i / 3) * 2] = (short) ((condensed[i + index] & 0xff) +
-                    256 * (condensed[i + index + 1] & 0xf));
-            parsed[(i / 3) * 2 + 1] = (short) (((condensed[i + index + 1] >>> 4) & 0xf) +
-                    16 * (condensed[i + index + 2] & 0xff));
-        }
-    }
-
     // The intrinsic implementations assume that the input and output buffers
     // are such that condensed can be read in 192-byte chunks and
     // parsed can be written in 128 shorts chunks. In other words,
@@ -1330,7 +1006,12 @@ private static void implMlKem12To16Java(byte[] condensed, int index,
     private void twelve2Sixteen(byte[] condensed, int index,
                                 short[] parsed, int parsedLength) {
 
-        implMlKem12To16(condensed, index, parsed, parsedLength);
+        for (int i = 0; i < parsedLength * 3 / 2; i += 3) {
+            parsed[(i / 3) * 2] = (short) ((condensed[i + index] & 0xff) +
+                    256 * (condensed[i + index + 1] & 0xf));
+            parsed[(i / 3) * 2 + 1] = (short) (((condensed[i + index + 1] >>> 4) & 0xf) +
+                    16 * (condensed[i + index + 2] & 0xff));
+        }
     }
 
     private static void decodePoly5(byte[] condensed, int index, short[] parsed) {
@@ -1471,18 +1152,6 @@ private static short[] decompressDecode(byte[] input) {
         return result;
     }
 
-    static void implMlKemBarrettReduce(short[] coeffs) {
-        implMlKemBarrettReduceJava(coeffs);
-    }
-
-    private static void implMlKemBarrettReduceJava(short[] coeffs) {
-        for (int m = 0; m < ML_KEM_N; m++) {
-            int tmp = ((int) coeffs[m] * BARRETT_MULTIPLIER) >>
-                    BARRETT_SHIFT;
-            coeffs[m] = (short) (coeffs[m] - tmp * ML_KEM_Q);
-        }
-    }
-
     // The input elements can have any short value.
     // Modifies poly such that upon return poly[i] will be
     // in the range [0, ML_KEM_Q] and will be congruent with the original
@@ -1493,7 +1162,10 @@ private static void implMlKemBarrettReduceJava(short[] coeffs) {
     // will be in the range [0, ML_KEM_Q), i.e. it will be the canonical
     // representative of its residue class.
     private void mlKemBarrettReduce(short[] poly) {
-        implMlKemBarrettReduce(poly);
+        for (int m = 0; m < ML_KEM_N; m++) {
+            int tmp = ((int) poly[m] * BARRETT_MULTIPLIER) >> BARRETT_SHIFT;
+            poly[m] = (short) (poly[m] - tmp * ML_KEM_Q);
+        }
     }
 
     // Precondition: -(2^MONT_R_BITS -1) * MONT_Q <= b * c < (2^MONT_R_BITS - 1) * MONT_Q
@@ -1503,8 +1175,8 @@ private static int montMul(int b, int c) {
         int a = b * c;
         int aHigh = a >> MONT_R_BITS;
         int aLow = a & ((1 << MONT_R_BITS) - 1);
-        int m = ((MONT_Q_INV_MOD_R * aLow) << (32 - MONT_R_BITS)) >>
-                (32 - MONT_R_BITS); // signed low product
+        // signed low product
+        int m = ((MONT_Q_INV_MOD_R * aLow) << (32 - MONT_R_BITS)) >> (32 - MONT_R_BITS);
 
         return (aHigh - ((m * MONT_Q) >> MONT_R_BITS)); // subtract signed high product
     }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java
index f59883a410e..2ce5b3324e7 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java
@@ -37,19 +37,6 @@
 
 public final class ML_KEM_Impls {
 
-    static int name2int(String name) {
-        if (name.endsWith("512")) {
-            return 512;
-        } else if (name.endsWith("768")) {
-            return 768;
-        } else if (name.endsWith("1024")) {
-            return 1024;
-        } else {
-            // should not happen
-            throw new ProviderException("Unknown name " + name);
-        }
-    }
-
     public sealed static class KPG
         extends NamedKeyPairGenerator permits KPG2, KPG3, KPG5 {
 
@@ -164,17 +151,8 @@ protected byte[] implDecapsulate(String name, byte[] decapsulationKey,
 
             ML_KEM mlKem = new ML_KEM(name);
             var kpkeCipherText = new ML_KEM.K_PKE_CipherText(cipherText);
-
-            byte[] decapsulateResult;
-            try {
-                decapsulateResult = mlKem.decapsulate(
-                        new ML_KEM.ML_KEM_DecapsulationKey(
-                            decapsulationKey), kpkeCipherText);
-            } catch (DecapsulateException e) {
-                throw new DecapsulateException("Decapsulate error", e) ;
-            }
-
-            return decapsulateResult;
+            return mlKem.decapsulate(new ML_KEM.ML_KEM_DecapsulationKey(
+                    decapsulationKey), kpkeCipherText);
         }
 
         @Override
diff --git a/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java
index 30fa3978638..1330766b078 100644
--- a/src/java.base/share/classes/java/io/FilePermission.java
+++ b/src/java.base/share/classes/java/io/FilePermission.java
@@ -283,7 +283,6 @@ public FilePermission newPermUsingAltPath(FilePermission input) {
      * @param mask the actions mask to use.
      *
      */
-    @SuppressWarnings("removal")
     private void init(int mask) {
         if ((mask & ALL) != mask)
                 throw new IllegalArgumentException("invalid actions mask");
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index e497e8faa6c..033d32611b0 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -549,7 +549,6 @@ public String(byte[] bytes, int offset, int length, Charset charset) {
      * Important: parameter order of this method is deliberately changed in order to
      * disambiguate it against other similar methods of this class.
      */
-    @SuppressWarnings("removal")
     private String(Charset charset, byte[] bytes, int offset, int length) {
         if (length == 0) {
             this.value = "".value;
@@ -787,7 +786,6 @@ static String newStringNoRepl(byte[] src, Charset cs) throws CharacterCodingExce
         }
     }
 
-    @SuppressWarnings("removal")
     private static String newStringNoRepl1(byte[] src, Charset cs) {
         int len = src.length;
         if (len == 0) {
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 11c77d48bf0..87aca3e1ffd 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -1379,7 +1379,6 @@ public static LoggerFinder getLoggerFinder() {
 
 
         private static volatile LoggerFinder service;
-        @SuppressWarnings("removal")
         static LoggerFinder accessProvider() {
             // We do not need to synchronize: LoggerFinderLoader will
             // always return the same instance, so if we don't have it,
@@ -1483,7 +1482,6 @@ public static Logger getLogger(String name) {
      *
      * @since 9
      */
-    @SuppressWarnings("removal")
     @CallerSensitive
     public static Logger getLogger(String name, ResourceBundle bundle) {
         final ResourceBundle rb = Objects.requireNonNull(bundle);
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassFileTransform.java b/src/java.base/share/classes/java/lang/classfile/ClassFileTransform.java
index 9fdafdf4331..7d9385eed68 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassFileTransform.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassFileTransform.java
@@ -60,12 +60,7 @@
  * its state must be reset for each traversal; this will happen automatically if
  * the transform is created with {@link ClassTransform#ofStateful(Supplier)} (or
  * corresponding methods for other classfile locations.)
- * <p>
- * Class transformation sample where code transformation is stateful:
- * {@snippet lang="java" class="PackageSnippets" region="codeRelabeling"}
- * <p>
- * Complex class instrumentation sample chaining multiple transformations:
- * {@snippet lang="java" class="PackageSnippets" region="classInstrumentation"}
+ *
  * @param <C> the transform type
  * @param <E> the element type
  * @param <B> the builder type
diff --git a/src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java b/src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java
index c6956d6d23a..7a58da7f6ce 100644
--- a/src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java
+++ b/src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java
@@ -25,21 +25,13 @@
 package java.lang.classfile.snippets;
 
 import java.lang.classfile.*;
-import java.lang.classfile.components.ClassRemapper;
-import java.lang.classfile.components.CodeLocalsShifter;
-import java.lang.classfile.components.CodeRelabeler;
 import java.lang.classfile.instruction.*;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.MethodHandles;
-import java.lang.reflect.AccessFlag;
-import java.util.ArrayDeque;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toSet;
@@ -326,82 +318,6 @@ void fooToBarUnrolled(ClassModel classModel) {
         // @end
     }
 
-    void codeRelabeling(ClassModel classModel) {
-        // @start region="codeRelabeling"
-        byte[] newBytes = ClassFile.of().transformClass(classModel,
-                ClassTransform.transformingMethodBodies(
-                        CodeTransform.ofStateful(CodeRelabeler::of)));
-        // @end
-    }
-
-    // @start region="classInstrumentation"
-    byte[] classInstrumentation(ClassModel target, ClassModel instrumentor, Predicate<MethodModel> instrumentedMethodsFilter) {
-        var instrumentorCodeMap = instrumentor.methods().stream()
-                                              .filter(instrumentedMethodsFilter)
-                                              .collect(Collectors.toMap(mm -> mm.methodName().stringValue() + mm.methodType().stringValue(), mm -> mm.code().orElseThrow()));
-        var targetFieldNames = target.fields().stream().map(f -> f.fieldName().stringValue()).collect(Collectors.toSet());
-        var targetMethods = target.methods().stream().map(m -> m.methodName().stringValue() + m.methodType().stringValue()).collect(Collectors.toSet());
-        var instrumentorClassRemapper = ClassRemapper.of(Map.of(instrumentor.thisClass().asSymbol(), target.thisClass().asSymbol()));
-        return ClassFile.of().transformClass(target,
-                ClassTransform.transformingMethods(
-                        instrumentedMethodsFilter,
-                        (mb, me) -> {
-                            if (me instanceof CodeModel targetCodeModel) {
-                                var mm = targetCodeModel.parent().get();
-                                //instrumented methods code is taken from instrumentor
-                                mb.transformCode(instrumentorCodeMap.get(mm.methodName().stringValue() + mm.methodType().stringValue()),
-                                        //all references to the instrumentor class are remapped to target class
-                                        instrumentorClassRemapper.asCodeTransform()
-                                        .andThen((codeBuilder, instrumentorCodeElement) -> {
-                                            //all invocations of target methods from instrumentor are inlined
-                                            if (instrumentorCodeElement instanceof InvokeInstruction inv
-                                                && target.thisClass().asInternalName().equals(inv.owner().asInternalName())
-                                                && mm.methodName().stringValue().equals(inv.name().stringValue())
-                                                && mm.methodType().stringValue().equals(inv.type().stringValue())) {
-
-                                                //store stacked method parameters into locals
-                                                var storeStack = new ArrayDeque<StoreInstruction>();
-                                                int slot = 0;
-                                                if (!mm.flags().has(AccessFlag.STATIC))
-                                                    storeStack.push(StoreInstruction.of(TypeKind.REFERENCE, slot++));
-                                                for (var pt : mm.methodTypeSymbol().parameterList()) {
-                                                    var tk = TypeKind.from(pt);
-                                                    storeStack.push(StoreInstruction.of(tk, slot));
-                                                    slot += tk.slotSize();
-                                                }
-                                                storeStack.forEach(codeBuilder::with);
-
-                                                //inlined target locals must be shifted based on the actual instrumentor locals
-                                                codeBuilder.block(inlinedBlockBuilder -> inlinedBlockBuilder
-                                                        .transform(targetCodeModel, CodeLocalsShifter.of(mm.flags(), mm.methodTypeSymbol())
-                                                        .andThen(CodeRelabeler.of())
-                                                        .andThen((innerBuilder, shiftedTargetCode) -> {
-                                                            //returns must be replaced with jump to the end of the inlined method
-                                                            if (shiftedTargetCode instanceof ReturnInstruction)
-                                                                innerBuilder.goto_(inlinedBlockBuilder.breakLabel());
-                                                            else
-                                                                innerBuilder.with(shiftedTargetCode);
-                                                        })));
-                                            } else
-                                                codeBuilder.with(instrumentorCodeElement);
-                                        }));
-                            } else
-                                mb.with(me);
-                        })
-                .andThen(ClassTransform.endHandler(clb ->
-                    //remaining instrumentor fields and methods are injected at the end
-                    clb.transform(instrumentor,
-                            ClassTransform.dropping(cle ->
-                                    !(cle instanceof FieldModel fm
-                                            && !targetFieldNames.contains(fm.fieldName().stringValue()))
-                                    && !(cle instanceof MethodModel mm
-                                            && !ConstantDescs.INIT_NAME.equals(mm.methodName().stringValue())
-                                            && !targetMethods.contains(mm.methodName().stringValue() + mm.methodType().stringValue())))
-                            //and instrumentor class references remapped to target class
-                            .andThen(instrumentorClassRemapper)))));
-    }
-    // @end
-
     void resolverExample() {
         // @start region="lookup-class-hierarchy-resolver"
         MethodHandles.Lookup lookup = MethodHandles.lookup(); // @replace regex="MethodHandles\.lookup\(\)" replacement="..."
diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
index cd38bd19227..024dfacb71b 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -1277,9 +1277,9 @@ MemorySegment reinterpret(long newSize,
      * @throws IllegalArgumentException if the size of the string is greater than the
      *         largest string supported by the platform
      * @throws IndexOutOfBoundsException if {@code offset < 0}
-     * @throws IndexOutOfBoundsException if {@code offset > byteSize() - (B + 1)}, where
-     *         {@code B} is the size, in bytes, of the string encoded using UTF-8 charset
-     *         {@code str.getBytes(StandardCharsets.UTF_8).length})
+     * @throws IndexOutOfBoundsException if no string terminator (e.g. {@code '\0'}) is
+     *         present in this segment between the given {@code offset} and the end of
+     *         this segment.
      * @throws IllegalStateException if the {@linkplain #scope() scope} associated with
      *         this segment is not {@linkplain Scope#isAlive() alive}
      * @throws WrongThreadException if this method is called from a thread {@code T},
@@ -1315,14 +1315,11 @@ MemorySegment reinterpret(long newSize,
      * @throws IllegalArgumentException  if the size of the string is greater than the
      *         largest string supported by the platform
      * @throws IndexOutOfBoundsException if {@code offset < 0}
-     * @throws IndexOutOfBoundsException if {@code offset > byteSize() - (B + N)}, where:
-     *         <ul>
-     *             <li>{@code B} is the size, in bytes, of the string encoded using the
-     *             provided charset (e.g. {@code str.getBytes(charset).length});</li>
-     *             <li>{@code N} is the size (in bytes) of the terminator char according
-     *             to the provided charset. For instance, this is 1 for
-     *             {@link StandardCharsets#US_ASCII} and 2 for {@link StandardCharsets#UTF_16}.</li>
-     *         </ul>
+     * @throws IndexOutOfBoundsException if no string terminator (e.g. {@code '\0'}) is
+     *         present in this segment between the given {@code offset} and the end of
+     *         this segment. The byte size of the string terminator depends on the
+     *         selected {@code charset}. For instance, this is 1 for
+     *         {@link StandardCharsets#US_ASCII} and 2 for {@link StandardCharsets#UTF_16}
      * @throws IllegalStateException if the {@linkplain #scope() scope} associated with
      *         this segment is not {@linkplain Scope#isAlive() alive}
      * @throws WrongThreadException if this method is called from a thread {@code T},
diff --git a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
index 8f934d6d67c..e03504a749b 100644
--- a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
+++ b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
@@ -578,7 +578,6 @@ S loadSpecies(S speciesData) {
          * @param speciesData what species we are generating
          * @return the generated concrete TopClass class
          */
-        @SuppressWarnings("removal")
         Class<? extends T> generateConcreteSpeciesCode(String className, ClassSpecializer<T,K,S>.SpeciesData speciesData) {
             byte[] classFile = generateConcreteSpeciesCodeFile(className, speciesData);
             var lookup = new MethodHandles.Lookup(topClass);
diff --git a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
index 96e0a7e729f..3b34453bc3f 100644
--- a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
+++ b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
@@ -103,7 +103,6 @@ final class ProxyGenerator {
     /**
      * debugging flag for saving generated class files
      */
-    @SuppressWarnings("removal")
     private static final boolean SAVE_GENERATED_FILES =
             Boolean.getBoolean("jdk.proxy.ProxyGenerator.saveGeneratedFiles");
 
diff --git a/src/java.base/share/classes/java/net/Inet6Address.java b/src/java.base/share/classes/java/net/Inet6Address.java
index ca73a6e1cc1..06a74ca3adc 100644
--- a/src/java.base/share/classes/java/net/Inet6Address.java
+++ b/src/java.base/share/classes/java/net/Inet6Address.java
@@ -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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -554,6 +554,10 @@ public static InetAddress ofLiteral(String ipv6AddressLiteral) {
      */
     static InetAddress parseAddressString(String addressLiteral, boolean removeSqBrackets)
             throws UnknownHostException {
+        // Empty strings are not parseable
+        if (addressLiteral.isEmpty()) {
+            return null;
+        }
         // Remove trailing and leading square brackets if requested
         if (removeSqBrackets && addressLiteral.charAt(0) == '[' &&
                 addressLiteral.length() > 2 &&
diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java
index e94df5a9e0a..4bceebdcd0e 100644
--- a/src/java.base/share/classes/java/net/InetAddress.java
+++ b/src/java.base/share/classes/java/net/InetAddress.java
@@ -1618,6 +1618,9 @@ static InetAddress[] getAllByName0(String host) throws UnknownHostException {
      */
     public static InetAddress ofLiteral(String ipAddressLiteral) {
         Objects.requireNonNull(ipAddressLiteral);
+        if (ipAddressLiteral.isEmpty()) {
+            throw IPAddressUtil.invalidIpAddressLiteral(ipAddressLiteral);
+        }
         InetAddress inetAddress;
         try {
             // First try to parse the input as an IPv4 address literal
diff --git a/src/java.base/share/classes/java/net/URLConnection.java b/src/java.base/share/classes/java/net/URLConnection.java
index 209b84de200..69f71942561 100644
--- a/src/java.base/share/classes/java/net/URLConnection.java
+++ b/src/java.base/share/classes/java/net/URLConnection.java
@@ -1388,7 +1388,6 @@ private ContentHandler lookupContentHandlerClassFor(String contentType) {
         return UnknownContentHandler.INSTANCE;
     }
 
-    @SuppressWarnings("removal")
     private ContentHandler lookupContentHandlerViaProvider(String contentType) {
 
         ClassLoader cl = ClassLoader.getSystemClassLoader();
diff --git a/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java b/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
index 1d9e32c31d3..b198f977dd5 100644
--- a/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
+++ b/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
@@ -90,7 +90,6 @@ private static AsynchronousChannelProvider loadProviderAsService() {
             ServiceLoader<AsynchronousChannelProvider> sl =
                 ServiceLoader.load(AsynchronousChannelProvider.class,
                                    ClassLoader.getSystemClassLoader());
-            Iterator<AsynchronousChannelProvider> i = sl.iterator();
             return sl.findFirst().orElse(null);
         }
     }
diff --git a/src/java.base/share/classes/java/nio/file/Files.java b/src/java.base/share/classes/java/nio/file/Files.java
index fa8ff8029e9..17d6eebbcb8 100644
--- a/src/java.base/share/classes/java/nio/file/Files.java
+++ b/src/java.base/share/classes/java/nio/file/Files.java
@@ -1509,7 +1509,7 @@ public static boolean isHidden(Path path) throws IOException {
     }
 
     // lazy loading of default and installed file type detectors
-    private static class FileTypeDetectors{
+    private static class FileTypeDetectors {
         static final FileTypeDetector defaultFileTypeDetector =
             createDefaultFileTypeDetector();
         static final List<FileTypeDetector> installedDetectors =
@@ -1522,13 +1522,11 @@ private static FileTypeDetector createDefaultFileTypeDetector() {
 
         // loads all installed file type detectors
         private static List<FileTypeDetector> loadInstalledDetectors() {
-            List<FileTypeDetector> list = new ArrayList<>();
-            ServiceLoader<FileTypeDetector> loader = ServiceLoader
-                .load(FileTypeDetector.class, ClassLoader.getSystemClassLoader());
-            for (FileTypeDetector detector: loader) {
-                list.add(detector);
-            }
-            return list;
+            return ServiceLoader.load(FileTypeDetector.class,
+                                      ClassLoader.getSystemClassLoader())
+                .stream()
+                .map(ServiceLoader.Provider::get)
+                .toList();
         }
     }
 
diff --git a/src/java.base/share/classes/java/security/DomainCombiner.java b/src/java.base/share/classes/java/security/DomainCombiner.java
index 704c6315bb1..1594a48783f 100644
--- a/src/java.base/share/classes/java/security/DomainCombiner.java
+++ b/src/java.base/share/classes/java/security/DomainCombiner.java
@@ -46,8 +46,7 @@ public interface DomainCombiner {
      * set of Permissions, for example).
      *
      * @param currentDomains the ProtectionDomains associated with the
-     *          current execution thread, up to the most recent
-     *          privileged {@code ProtectionDomain}.
+     *          current execution thread.
      *          The ProtectionDomains are listed in order of execution,
      *          with the most recently executing {@code ProtectionDomain}
      *          residing at the beginning of the array. This parameter may
@@ -55,8 +54,6 @@ public interface DomainCombiner {
      *          has no associated ProtectionDomains.
      *
      * @param assignedDomains an array of inherited ProtectionDomains.
-     *          ProtectionDomains may be inherited from a parent thread,
-     *          or from a privileged {@code AccessControlContext}.
      *          This parameter may be {@code null}
      *          if there are no inherited ProtectionDomains.
      *
diff --git a/src/java.base/share/classes/java/security/Policy.java b/src/java.base/share/classes/java/security/Policy.java
index 5bf590623f4..89876498cf5 100644
--- a/src/java.base/share/classes/java/security/Policy.java
+++ b/src/java.base/share/classes/java/security/Policy.java
@@ -43,7 +43,7 @@
  *       supported. Installing a system-wide {@code Policy} object is no longer
  *       supported. The {@linkplain #setPolicy setPolicy} method has been
  *       changed to always throw {@code UnsupportedOperationException}. The
- *       {@linkplain getPolicy getPolicy} method has been changed to always
+ *       {@linkplain #getPolicy getPolicy} method has been changed to always
  *       return a {@code Policy} object that grants no permissions. There is no
  *       replacement for the Security Manager or this class.
  */
diff --git a/src/java.base/share/classes/java/security/PrivilegedAction.java b/src/java.base/share/classes/java/security/PrivilegedAction.java
index 39db3492c01..56f7878bc6a 100644
--- a/src/java.base/share/classes/java/security/PrivilegedAction.java
+++ b/src/java.base/share/classes/java/security/PrivilegedAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, 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
@@ -27,8 +27,8 @@
 
 
 /**
- * A computation to be performed with privileges enabled.  The computation is
- * performed by invoking {@code AccessController.doPrivileged} on the
+ * A computation to be performed by invoking
+ * {@code AccessController.doPrivileged} on the
  * {@code PrivilegedAction} object.  This interface is used only for
  * computations that do not throw checked exceptions; computations that
  * throw checked exceptions must use {@code PrivilegedExceptionAction}
@@ -44,7 +44,7 @@
 public interface PrivilegedAction<T> {
     /**
      * Performs the computation.  This method will be called by
-     * {@code AccessController.doPrivileged} after enabling privileges.
+     * {@code AccessController.doPrivileged}.
      *
      * @return a class-dependent value that may represent the results of the
      *         computation. Each class that implements
diff --git a/src/java.base/share/classes/java/security/PrivilegedActionException.java b/src/java.base/share/classes/java/security/PrivilegedActionException.java
index 9c52d8739b8..1c1418f4267 100644
--- a/src/java.base/share/classes/java/security/PrivilegedActionException.java
+++ b/src/java.base/share/classes/java/security/PrivilegedActionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, 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
@@ -63,7 +63,7 @@ public PrivilegedActionException(Exception exception) {
     }
 
     /**
-     * Returns the exception thrown by the privileged computation that
+     * Returns the exception thrown by the computation that
      * resulted in this {@code PrivilegedActionException}.
      *
      * @apiNote
@@ -71,7 +71,7 @@ public PrivilegedActionException(Exception exception) {
      * The {@link Throwable#getCause()} method is now the preferred means of
      * obtaining this information.
      *
-     * @return the exception thrown by the privileged computation that
+     * @return the exception thrown by the computation that
      *         resulted in this {@code PrivilegedActionException}.
      * @see PrivilegedExceptionAction
      * @see AccessController#doPrivileged(PrivilegedExceptionAction)
@@ -90,7 +90,7 @@ public String toString() {
 
 
     /**
-     * The exception thrown by the privileged computation that resulted
+     * The exception thrown by the computation that resulted
      * in this {@code PrivilegedActionException}.
      *
      * @serialField exception Exception the thrown Exception
diff --git a/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java b/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java
index 00863ddf4a1..d875a2a4159 100644
--- a/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java
+++ b/src/java.base/share/classes/java/security/PrivilegedExceptionAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, 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
@@ -27,8 +27,8 @@
 
 
 /**
- * A computation to be performed with privileges enabled, that throws one or
- * more checked exceptions.  The computation is performed by invoking
+ * A computation to be performed that throws one or more checked exceptions.
+ * The computation is performed by invoking
  * {@code AccessController.doPrivileged} on the
  * {@code PrivilegedExceptionAction} object.  This interface is
  * used only for computations that throw checked exceptions;
@@ -47,7 +47,7 @@
 public interface PrivilegedExceptionAction<T> {
     /**
      * Performs the computation.  This method will be called by
-     * {@code AccessController.doPrivileged} after enabling privileges.
+     * {@code AccessController.doPrivileged}.
      *
      * @return a class-dependent value that may represent the results of the
      *         computation.  Each class that implements
diff --git a/src/java.base/share/classes/java/security/ProtectionDomain.java b/src/java.base/share/classes/java/security/ProtectionDomain.java
index 231f998edb3..19ee5815db0 100644
--- a/src/java.base/share/classes/java/security/ProtectionDomain.java
+++ b/src/java.base/share/classes/java/security/ProtectionDomain.java
@@ -25,9 +25,6 @@
 
 package java.security;
 
-import jdk.internal.access.JavaSecurityAccess;
-import jdk.internal.access.SharedSecrets;
-
 /**
  * The {@code ProtectionDomain} class encapsulates the characteristics of a
  * domain, which encloses a set of classes whose instances are granted a set
@@ -51,39 +48,6 @@
 
 public class ProtectionDomain {
 
-    private static class JavaSecurityAccessImpl implements JavaSecurityAccess {
-
-        private JavaSecurityAccessImpl() {
-        }
-
-        @SuppressWarnings("removal")
-        @Override
-        public <T> T doIntersectionPrivilege(
-                PrivilegedAction<T> action,
-                final AccessControlContext stack,
-                final AccessControlContext context) {
-            if (action == null) {
-                throw new NullPointerException();
-            }
-
-            return AccessController.doPrivileged(action);
-        }
-
-        @SuppressWarnings("removal")
-        @Override
-        public <T> T doIntersectionPrivilege(
-                PrivilegedAction<T> action,
-                AccessControlContext context) {
-            return doIntersectionPrivilege(action,
-                AccessController.getContext(), context);
-        }
-    }
-
-    static {
-        // Set up JavaSecurityAccess in SharedSecrets
-        SharedSecrets.setJavaSecurityAccess(new JavaSecurityAccessImpl());
-    }
-
     /* CodeSource */
     private final CodeSource codesource ;
 
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index c055c160367..d0d42e7199e 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -45,7 +45,7 @@
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.io.Serializable;
-import java.text.DateFormat;
+import java.text.NumberFormat;
 import java.text.MessageFormat;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -70,131 +70,151 @@
 import sun.util.locale.provider.TimeZoneNameUtility;
 
 /**
- * A {@code Locale} object represents a specific geographical, political,
- * or cultural region. An operation that requires a {@code Locale} to perform
- * its task is called <em>locale-sensitive</em> and uses the {@code Locale}
- * to tailor information for the user. For example, displaying a number
- * is a locale-sensitive operation&mdash; the number should be formatted
- * according to the customs and conventions of the user's native country,
- * region, or culture.
- *
- * <p> The {@code Locale} class implements IETF BCP 47 which is composed of
+ * A {@code Locale} represents a specific geographical, political,
+ * or cultural region. An API that requires a {@code Locale} to perform
+ * its task is <dfn>{@index "locale-sensitive"}</dfn> and uses the {@code Locale}
+ * to tailor information for the user. These <em>locale-sensitive</em> APIs
+ * are principally in the <i>java.text</i> and <i>java.util</i> packages.
+ * For example, displaying a number is a <em>locale-sensitive</em> operation&mdash;
+ * the number should be formatted according to the customs and conventions of the
+ * user's native country, region, or culture.
+ *
+ * <p>The {@code Locale} class implements IETF BCP 47 which is composed of
  * <a href="https://tools.ietf.org/html/rfc4647">RFC 4647 "Matching of Language
  * Tags"</a> and <a href="https://tools.ietf.org/html/rfc5646">RFC 5646 "Tags
  * for Identifying Languages"</a> with support for the LDML (UTS#35, "Unicode
  * Locale Data Markup Language") BCP 47-compatible extensions for locale data
- * exchange.
- *
- * <p> A {@code Locale} object logically consists of the fields
- * described below.
+ * exchange. Each {@code Locale} is associated with locale data which is provided
+ * by the Java runtime environment or any deployed {@link
+ * java.util.spi.LocaleServiceProvider LocaleServiceProvider} implementations.
+ * The locale data provided by the Java runtime environment may vary by release.
+ *
+ * <h2 id="loc_comp">Locale Composition</h2>
+ * <p> A {@code Locale} is composed of the bolded fields described below; note that a
+ * {@code Locale} need not have all such fields. For example, {@link
+ * Locale#ENGLISH Locale.ENGLISH} is only comprised of the <em>language</em> field.
+ * In contrast, a {@code Locale} such as the one returned by {@code
+ * Locale.forLanguageTag("en-Latn-US-POSIX-u-nu-latn")} would be comprised of all
+ * the fields below. This particular {@code Locale} would represent English in
+ * the United States using the Latin script and numerics for use in POSIX
+ * environments.
+ * <p>
+ * {@code Locale} implements IETF BCP 47 and any deviations should be observed
+ * by the comments prefixed by <em>"BCP 47 deviation:"</em>.
+ * <a href="https://tools.ietf.org/html/rfc5646">RFC 5646</a>
+ * combines subtags from various ISO (639, 3166, 15924) standards which are also
+ * included in the composition of {@code Locale}.
+ * Additionally, the full list of valid codes for each field can be found in the
+ * <a href="https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry">
+ * IANA Language Subtag Registry</a> (e.g. search for "Type: region").
  *
  * <dl>
  *   <dt><a id="def_language"><b>language</b></a></dt>
- *
- *   <dd>ISO 639 alpha-2 or alpha-3 language code, or registered
- *   language subtags up to 8 alpha letters (for future enhancements).
+ *   <dd> ISO 639 alpha-2/alpha-3 language code or a registered
+ *   language subtag up to 8 alpha letters (for future enhancements).
  *   When a language has both an alpha-2 code and an alpha-3 code, the
- *   alpha-2 code must be used.  You can find a full list of valid
- *   language codes in the IANA Language Subtag Registry (search for
- *   "Type: language").  The language field is case insensitive, but
+ *   alpha-2 code must be used.</dd>
+ *
+ *   <dd> <em>Case convention:</em> {@code language} is case insensitive, but
  *   {@code Locale} always canonicalizes to lower case.</dd>
  *
- *   <dd>Well-formed language values have the form
- *   <code>[a-zA-Z]{2,8}</code>.  Note that this is not the full
- *   BCP47 language production, since it excludes extlang.  They are
- *   not needed since modern three-letter language codes replace
- *   them.</dd>
+ *   <dd> <em>Syntax:</em> Well-formed {@code language} values have the form {@code [a-zA-Z]{2,8}}.</dd>
+ *   <dd> <em> BCP 47 deviation:</em> this is not the full BCP 47 language production, since it excludes
+ *   <a href="https://datatracker.ietf.org/doc/html/rfc5646#section-2.2.2">extlang</a>
+ *   (as modern three-letter language codes are preferred).</dd>
  *
- *   <dd>Example: "en" (English), "ja" (Japanese), "kok" (Konkani)</dd>
+ *   <dd> <em>Example:</em> "en" (English), "ja" (Japanese), "kok" (Konkani)</dd>
  *
  *   <dt><a id="def_script"><b>script</b></a></dt>
  *
- *   <dd>ISO 15924 alpha-4 script code.  You can find a full list of
- *   valid script codes in the IANA Language Subtag Registry (search
- *   for "Type: script").  The script field is case insensitive, but
+ *   <dd> ISO 15924 alpha-4 script code.</dd>
+ *
+ *   <dd> <em>Case convention:</em> {@code script} is case insensitive, but
  *   {@code Locale} always canonicalizes to title case (the first
  *   letter is upper case and the rest of the letters are lower
  *   case).</dd>
  *
- *   <dd>Well-formed script values have the form
- *   <code>[a-zA-Z]{4}</code></dd>
+ *   <dd> <em>Syntax:</em> Well-formed {@code script} values have the form {@code
+ *   [a-zA-Z]{4}}</dd>
  *
- *   <dd>Example: "Latn" (Latin), "Cyrl" (Cyrillic)</dd>
+ *   <dd> <em>Example:</em> "Latn" (Latin), "Cyrl" (Cyrillic)</dd>
  *
  *   <dt><a id="def_region"><b>country (region)</b></a></dt>
  *
- *   <dd>ISO 3166 alpha-2 country code or UN M.49 numeric-3 area code.
- *   You can find a full list of valid country and region codes in the
- *   IANA Language Subtag Registry (search for "Type: region").  The
- *   country (region) field is case insensitive, but
+ *   <dd> ISO 3166 alpha-2 country code or UN M.49 numeric-3 area code.</dd>
+ *
+ *   <dd> <em>Case convention:</em> {@code country (region)} is case insensitive, but
  *   {@code Locale} always canonicalizes to upper case.</dd>
  *
- *   <dd>Well-formed country/region values have
- *   the form <code>[a-zA-Z]{2} | [0-9]{3}</code></dd>
+ *   <dd> <em>Syntax:</em> Well-formed {@code country (region)} values have the form {@code
+ *   [a-zA-Z]{2} | [0-9]{3}}</dd>
  *
- *   <dd>Example: "US" (United States), "FR" (France), "029"
+ *   <dd> <em>Example:</em> "US" (United States), "FR" (France), "029"
  *   (Caribbean)</dd>
  *
  *   <dt><a id="def_variant"><b>variant</b></a></dt>
  *
- *   <dd>Any arbitrary value used to indicate a variation of a
- *   {@code Locale}.  Where there are two or more variant values
- *   each indicating its own semantics, these values should be ordered
- *   by importance, with most important first, separated by
- *   underscore('_').  The variant field is case sensitive.</dd>
- *
- *   <dd>Note: IETF BCP 47 places syntactic restrictions on variant
- *   subtags.  Also BCP 47 subtags are strictly used to indicate
+ *   <dd> Any arbitrary value used to indicate a variation of a
+ *   {@code Locale}. When multiple variants exist, they should be separated by
+ *   {@code ('_'|'-')}. Variants of higher importance should precede the others.</dd>
+ *   <dd> <em>BCP 47 deviation:</em> BCP 47 subtags are strictly used to indicate
  *   additional variations that define a language or its dialects that
  *   are not covered by any combinations of language, script and
- *   region subtags.  You can find a full list of valid variant codes
- *   in the IANA Language Subtag Registry (search for "Type: variant").
- *
- *   <p>However, the variant field in {@code Locale} has
+ *   region subtags. However, the variant field in {@code Locale} has
  *   historically been used for any kind of variation, not just
  *   language variations.  For example, some supported variants
  *   available in Java SE Runtime Environments indicate alternative
  *   cultural behaviors such as calendar type or number script.  In
- *   BCP 47 this kind of information, which does not identify the
+ *   BCP 47, this kind of information which does not identify the
  *   language, is supported by extension subtags or private use
  *   subtags.</dd>
  *
- *   <dd>Well-formed variant values have the form <code>SUBTAG
- *   (('_'|'-') SUBTAG)*</code> where <code>SUBTAG =
- *   [0-9][0-9a-zA-Z]{3} | [0-9a-zA-Z]{5,8}</code>. (Note: BCP 47 only
- *   uses hyphen ('-') as a delimiter, this is more lenient).</dd>
+ *   <dd> <em>Case convention:</em> {@code variant} is case sensitive. BCP 47
+ *   deviation: BCP 47 treats the variant field as case insensitive.</dd>
  *
- *   <dd>Example: "polyton" (Polytonic Greek), "POSIX"</dd>
+ *   <dd> <em>Syntax:</em> Well-formed {@code variant} values have the form {@code
+ *   SUBTAG (('_'|'-') SUBTAG)*} where {@code SUBTAG =
+ *   [0-9][0-9a-zA-Z]{3} | [0-9a-zA-Z]{5,8}}.</dd>
+ *   <dd> <em>BCP 47 deviation:</em> BCP 47 only
+ *   uses hyphen ('-') as a delimiter, {@code Locale} is more lenient.</dd>
+ *
+ *   <dd> <em>Example:</em> "polyton" (Polytonic Greek), "POSIX"</dd>
  *
  *   <dt><a id="def_extensions"><b>extensions</b></a></dt>
  *
- *   <dd>A map from single character keys to string values, indicating
- *   extensions apart from language identification.  The extensions in
- *   {@code Locale} implement the semantics and syntax of BCP 47
- *   extension subtags and private use subtags. The extensions are
+ *   <dd> A map from single character keys to string values, indicating
+ *   extensions apart from language identification.</dd>
+ *   <dd> <em> BCP 47 deviation:</em> The {@code
+ *   extensions} in {@code Locale} implement the semantics and syntax of BCP 47
+ *   extension subtags <em>and</em> private use subtags. The {@code extensions}
+ *   field cannot have empty values. </dd>
+ *
+ *   <dd> <em>Case convention:</em> {@code extensions} are
  *   case insensitive, but {@code Locale} canonicalizes all
- *   extension keys and values to lower case. Note that extensions
- *   cannot have empty values.</dd>
+ *   extension keys and values to lower case.</dd>
  *
- *   <dd>Well-formed keys are single characters from the set
+ *   <dd> <em>Syntax:</em> Well-formed keys are single characters from the set
  *   {@code [0-9a-zA-Z]}.  Well-formed values have the form
  *   {@code SUBTAG ('-' SUBTAG)*} where for the key 'x'
- *   <code>SUBTAG = [0-9a-zA-Z]{1,8}</code> and for other keys
- *   <code>SUBTAG = [0-9a-zA-Z]{2,8}</code> (that is, 'x' allows
+ *   {@code SUBTAG = [0-9a-zA-Z]{1,8}} and for other keys
+ *   {@code SUBTAG = [0-9a-zA-Z]{2,8}} (that is, 'x' allows
  *   single-character subtags).</dd>
  *
- *   <dd>Example: key="u"/value="ca-japanese" (Japanese Calendar),
+ *   <dd> <em>Example:</em> key="u"/value="ca-japanese" (Japanese Calendar),
  *   key="x"/value="java-1-7"</dd>
  * </dl>
  *
- * <b>Note:</b> Although BCP 47 requires field values to be registered
+ * <b>BCP 47 deviation:</b> Although BCP 47 requires field values to be registered
  * in the IANA Language Subtag Registry, the {@code Locale} class
- * does not provide any validation features.  The {@code Builder}
+ * does not validate this requirement. For example, the variant code <em>"foobar"</em>
+ * is well-formed since it is composed of 5 to 8 alphanumerics, but is not defined
+ * the IANA Language Subtag Registry. The {@link Builder}
  * only checks if an individual field satisfies the syntactic
  * requirement (is well-formed), but does not validate the value
- * itself.  See {@link Builder} for details.
+ * itself. Conversely, {@link #of(String, String, String) Locale::of} and its
+ * overloads do not make any syntactic checks on the input.
  *
- * <h2><a id="def_locale_extension">Unicode locale/language extension</a></h2>
+ * <h3><a id="def_locale_extension">Unicode BCP 47 U Extension</a></h3>
  *
  * <p>UTS#35, "Unicode Locale Data Markup Language" defines optional
  * attributes and keywords to override or refine the default behavior
@@ -213,7 +233,7 @@
  * String representing this information, for example, "nu-thai".  The
  * {@code Locale} class also provides {@link
  * #getUnicodeLocaleAttributes}, {@link #getUnicodeLocaleKeys}, and
- * {@link #getUnicodeLocaleType} which allow you to access Unicode
+ * {@link #getUnicodeLocaleType(String)} which provides access to the Unicode
  * locale attributes and key/type pairs directly.  When represented as
  * a string, the Unicode Locale Extension lists attributes
  * alphabetically, followed by key/type sequences with keys listed
@@ -221,11 +241,11 @@
  * fixed when the type is defined)
  *
  * <p>A well-formed locale key has the form
- * <code>[0-9a-zA-Z]{2}</code>.  A well-formed locale type has the
- * form <code>"" | [0-9a-zA-Z]{3,8} ('-' [0-9a-zA-Z]{3,8})*</code> (it
+ * {@code [0-9a-zA-Z]{2}}.  A well-formed locale type has the
+ * form {@code "" | [0-9a-zA-Z]{3,8} ('-' [0-9a-zA-Z]{3,8})*} (it
  * can be empty, or a series of subtags 3-8 alphanums in length).  A
  * well-formed locale attribute has the form
- * <code>[0-9a-zA-Z]{3,8}</code> (it is a single subtag with the same
+ * {@code [0-9a-zA-Z]{3,8}} (it is a single subtag with the same
  * form as a locale type subtag).
  *
  * <p>The Unicode locale extension specifies optional behavior in
@@ -234,36 +254,11 @@
  * implementations in a Java Runtime Environment might not support any
  * particular Unicode locale attributes or key/type pairs.
  *
- * <h3><a id="ObtainingLocale">Obtaining a Locale</a></h3>
- *
- * <p>There are several ways to obtain a {@code Locale}
- * object.
- *
- * <h4>Builder</h4>
- *
- * <p>Using {@link Builder} you can construct a {@code Locale} object
- * that conforms to BCP 47 syntax.
- *
- * <h4>Factory Methods</h4>
- *
- * <p>The method {@link #forLanguageTag} obtains a {@code Locale}
- * object for a well-formed BCP 47 language tag. The method
- * {@link #of(String, String, String)} and its overloads obtain a
- * {@code Locale} object from given {@code language}, {@code country},
- * and/or {@code variant} defined above.
- *
- * <h4>Locale Constants</h4>
- *
- * <p>The {@code Locale} class provides a number of convenient constants
- * that you can use to obtain {@code Locale} objects for commonly used
- * locales. For example, {@code Locale.US} is the {@code Locale} object
- * for the United States.
- *
- * <h3><a id="default_locale">Default Locale</a></h3>
+ * <h2><a id="default_locale">Default Locale</a></h2>
  *
- * <p>The default Locale is provided for any locale-sensitive methods if no
+ * <p>The default Locale is provided for any <em>locale-sensitive</em> methods if no
  * {@code Locale} is explicitly specified as an argument, such as
- * {@link DateFormat#getInstance()}. The default Locale is determined at startup
+ * {@link NumberFormat#getInstance()}. The default Locale is determined at startup
  * of the Java runtime and established in the following three phases:
  * <ol>
  * <li>The locale-related system properties listed below are established from the
@@ -316,6 +311,7 @@
  * system properties are not altered. It is not recommended that applications read
  * these system properties and parse or interpret them as their values may be out of date.
  *
+ * <h3>Locale Category</h3>
  * <p>There are finer-grained default Locales specific for each {@link Locale.Category}.
  * These category specific default Locales can be queried by {@link #getDefault(Category)},
  * and set by {@link #setDefault(Category, Locale)}. Construction of these category
@@ -327,19 +323,87 @@
  * category. In the absence of category specific system properties, the "category-less"
  * system properties are used, such as {@code user.language} in the previous example.
  *
- * <h3><a id="LocaleMatching">Locale Matching</a></h3>
+ * <h2><a id="ObtainingLocale">Obtaining a Locale</a></h2>
  *
- * <p>If an application or a system is internationalized and provides localized
+ * <p>There are several ways to obtain a {@code Locale} object.
+ * It is advised against using the deprecated {@code Locale} constructors.
+ *
+ * <dl>
+ *  <dt><b>Locale Constants</b></dt>
+ *  <dd>A number of convenient constants are provided that return {@code Locale}
+ *  objects for commonly used locales. For example, {@link #US Locale.US} is the
+ *  {@code Locale} object for the United States.</dd>
+ *  <dt><b>Factory Methods</b></dt>
+ *  <dd>{@link #of(String, String, String) Locale::of} and its overloads obtain a
+ *  {@code Locale} object from the given {@code language}, {@code country},
+ *  and/or {@code variant}. {@link #forLanguageTag(String)} obtains a {@code Locale}
+ *  object for a well-formed BCP 47 language tag.</dd>
+ *  <dt><b>Builder</b></dt>
+ *  <dd>{@link Builder} is used to construct a {@code Locale} object that conforms
+ *  to BCP 47 syntax. Use a builder to enforce syntactic restrictions on the input.</dd>
+ * </dl>
+ * <p>The following invocations produce Locale objects that are all equivalent:
+ * {@snippet lang=java :
+ *     Locale.US;
+ *     Locale.of("en", "US");
+ *     Locale.forLanguageTag("en-US");
+ *     new Locale.Builder().setLanguage("en").setRegion("US").build();
+ * }
+ *
+ * <h2>Usage Examples</h2>
+ *
+ * <p>Once a {@code Locale} is {@linkplain ##ObtainingLocale obtained},
+ * it can be queried for information about itself. For example, use {@link
+ * #getCountry} to get the country (or region) code and {@link #getLanguage} to
+ * get the language. {@link #getDisplayCountry} can be used to get the
+ * name of the country suitable for displaying to the user. Similarly,
+ * use {@link #getDisplayLanguage()} to get the name of
+ * the language suitable for displaying to the user. The {@code getDisplayXXX}
+ * methods are themselves <em>locale-sensitive</em> and have two variants; one with an explicit
+ * locale parameter, and one without. The latter uses the default {@link
+ * Locale.Category#DISPLAY DISPLAY} locale, so the following are equivalent :
+ * {@snippet lang=java :
+ *     Locale.getDefault().getDisplayCountry();
+ *     Locale.getDefault().getDisplayCountry(Locale.getDefault(Locale.Category.DISPLAY));
+ * }
+ *
+ * <p>The Java Platform provides a number of classes that perform locale-sensitive
+ * operations. For example, the {@code NumberFormat} class formats
+ * numbers, currency, and percentages in a <em>locale-sensitive</em> manner. Classes such
+ * as {@code NumberFormat} have several factory methods for creating a default object
+ * of that type. These methods generally have two variants; one with an explicit
+ * locale parameter, and one without. The latter uses the default {@link
+ * Locale.Category#FORMAT FORMAT} locale, so the following are equivalent :
+ * {@snippet lang=java :
+ *     NumberFormat.getCurrencyInstance();
+ *     NumberFormat.getCurrencyInstance(Locale.getDefault(Locale.Category.FORMAT));
+ * }
+ *
+ * <p>
+ * The following example demonstrates <em>locale-sensitive</em> currency and
+ * date related operations under different locales :
+ * {@snippet lang = java:
+ *     var number = 1000;
+ *     NumberFormat.getCurrencyInstance(Locale.US).format(number); // returns "$1,000.00"
+ *     NumberFormat.getCurrencyInstance(Locale.JAPAN).format(number); // returns "\u00A51,000""
+ *     var date = LocalDate.of(2024, 1, 1);
+ *     DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.US).format(date); // returns "January 1, 2024"
+ *     DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.JAPAN).format(date); // returns "2024\u5e741\u67081\u65e5"
+ * }
+ *
+ * <h2><a id="LocaleMatching">Locale Matching</a></h2>
+ *
+ * <p>If an application is internationalized and provides localized
  * resources for multiple locales, it sometimes needs to find one or more
  * locales (or language tags) which meet each user's specific preferences. Note
- * that a term "language tag" is used interchangeably with "locale" in this
- * locale matching documentation.
+ * that the term "<dfn>{@index "language tag"}</dfn>" is used interchangeably
+ * with "locale" in the following locale matching documentation.
  *
- * <p>In order to do matching a user's preferred locales to a set of language
+ * <p>In order to match a user's preferred locales to a set of language
  * tags, <a href="https://tools.ietf.org/html/rfc4647">RFC 4647 Matching of
  * Language Tags</a> defines two mechanisms: filtering and lookup.
  * <em>Filtering</em> is used to get all matching locales, whereas
- * <em>lookup</em> is to choose the best matching locale.
+ * <em>lookup</em> is to select the best matching locale.
  * Matching is done case-insensitively. These matching mechanisms are described
  * in the following sections.
  *
@@ -348,7 +412,8 @@
  * language ranges: basic and extended. See
  * {@link Locale.LanguageRange Locale.LanguageRange} for details.
  *
- * <h4>Filtering</h4>
+ *
+ * <h3>Filtering</h3>
  *
  * <p>The filtering operation returns all matching language tags. It is defined
  * in RFC 4647 as follows:
@@ -366,7 +431,7 @@
  * {@link Locale.FilteringMode} is a parameter to specify how filtering should
  * be done.
  *
- * <h4>Lookup</h4>
+ * <h3>Lookup</h3>
  *
  * <p>The lookup operation returns the best matching language tags. It is
  * defined in RFC 4647 as follows:
@@ -398,76 +463,50 @@
  * an {@link Iterator} over a {@link Collection} of language tags is treated as
  * the best matching one.
  *
- * <h3>Use of Locale</h3>
+ * <h3>Serialization</h3>
  *
- * <p>Once you've obtained a {@code Locale} you can query it for information
- * about itself. Use {@code getCountry} to get the country (or region)
- * code and {@code getLanguage} to get the language code.
- * You can use {@code getDisplayCountry} to get the
- * name of the country suitable for displaying to the user. Similarly,
- * you can use {@code getDisplayLanguage} to get the name of
- * the language suitable for displaying to the user. Interestingly,
- * the {@code getDisplayXXX} methods are themselves locale-sensitive
- * and have two versions: one that uses the default
- * {@link Locale.Category#DISPLAY DISPLAY} locale and one
- * that uses the locale specified as an argument.
+ * <p>During serialization, writeObject writes all fields to the output
+ * stream, including extensions.
  *
- * <p>The Java Platform provides a number of classes that perform locale-sensitive
- * operations. For example, the {@code NumberFormat} class formats
- * numbers, currency, and percentages in a locale-sensitive manner. Classes
- * such as {@code NumberFormat} have several convenience methods
- * for creating a default object of that type. For example, the
- * {@code NumberFormat} class provides these three convenience methods
- * for creating a default {@code NumberFormat} object:
- * {@snippet lang=java :
- *     NumberFormat.getInstance();
- *     NumberFormat.getCurrencyInstance();
- *     NumberFormat.getPercentInstance();
- * }
- * Each of these methods has two variants; one with an explicit locale
- * and one without; the latter uses the default
- * {@link Locale.Category#FORMAT FORMAT} locale:
- * {@snippet lang=java :
- *     NumberFormat.getInstance(myLocale);
- *     NumberFormat.getCurrencyInstance(myLocale);
- *     NumberFormat.getPercentInstance(myLocale);
- * }
- * A {@code Locale} is the mechanism for identifying the kind of object
- * ({@code NumberFormat}) that you would like to get. The locale is
- * <STRONG>just</STRONG> a mechanism for identifying objects,
- * <STRONG>not</STRONG> a container for the objects themselves.
- *
- * <h3>Compatibility</h3>
- *
- * <p>In order to maintain compatibility, Locale's
- * constructors retain their behavior prior to the Java Runtime
- * Environment version 1.7.  The same is largely true for the
- * {@code toString} method. Thus Locale objects can continue to
- * be used as they were. In particular, clients who parse the output
- * of toString into language, country, and variant fields can continue
- * to do so (although this is strongly discouraged), although the
- * variant field will have additional information in it if script or
- * extensions are present.
+ * <p>During deserialization, readResolve adds extensions as described
+ * in {@linkplain ##special_cases_constructor Special Cases}, only
+ * for the two cases th_TH_TH and ja_JP_JP.
+ *
+ * @implNote
+ * <h2>Compatibility</h2>
+ * <p> The following commentary is provided for apps that want to ensure
+ * interoperability with older releases of {@code Locale} provided by the
+ * reference implementation.
+ * <h3><a id="locale_behavior">Locale Behavior</a></h3>
+ * In order to maintain compatibility, Locale's (deprecated) constructors,
+ * {@link #of(String, String, String)}, and its overloads retain their behavior prior to the Java Runtime
+ * Environment version 1.7. That is, a length constraint is not imposed on any of
+ * the input parameters. Similarly, the same preservation of past behavior is largely true
+ * for the {@link #toString()} method.
+ * Apps that previously parsed the output of {@link #toString()} into language,
+ * country, and variant fields can continue to do so (although this is strongly
+ * discouraged). A caveat is that the variant field will have additional
+ * information in it if script or extensions are present.
  *
  * <p>In addition, BCP 47 imposes syntax restrictions that are not
  * imposed by Locale's constructors. This means that conversions
  * between some Locales and BCP 47 language tags cannot be made without
- * losing information. Thus {@code toLanguageTag} cannot
+ * losing information. Thus {@link #toLanguageTag} cannot
  * represent the state of locales whose language, country, or variant
  * do not conform to BCP 47.
  *
- * <p>Because of these issues, it is recommended that clients migrate
+ * <p>Because of these issues, it is recommended that apps migrate
  * away from constructing non-conforming locales and use the
- * {@code forLanguageTag} and {@code Locale.Builder} APIs instead.
- * Clients desiring a string representation of the complete locale can
- * then always rely on {@code toLanguageTag} for this purpose.
+ * {@link #forLanguageTag(String)} and {@link Locale.Builder} APIs instead.
+ * Apps desiring a string representation of the complete locale can
+ * then always rely on {@link #toLanguageTag} for this purpose.
  *
- * <h4><a id="special_cases_constructor">Special cases</a></h4>
+ * <h3><a id="special_cases_constructor">Special cases</a></h3>
  *
  * <p>For compatibility reasons, two
  * non-conforming locales are treated as special cases.  These are
  * <b>{@code ja_JP_JP}</b> and <b>{@code th_TH_TH}</b>. These are ill-formed
- * in BCP 47 since the variants are too short. To ease migration to BCP 47,
+ * in BCP 47 since the {@linkplain ##def_variant variants} are too short. To ease migration to BCP 47,
  * these are treated specially during construction.  These two cases (and only
  * these) cause a constructor to generate an extension, all other values behave
  * exactly as they did prior to Java 7.
@@ -487,25 +526,16 @@
  * constructor is called with the arguments "th", "TH", "TH", the
  * extension "u-nu-thai" is automatically added.
  *
- * <h4>Serialization</h4>
- *
- * <p>During serialization, writeObject writes all fields to the output
- * stream, including extensions.
- *
- * <p>During deserialization, readResolve adds extensions as described
- * in {@linkplain ##special_cases_constructor Special Cases}, only
- * for the two cases th_TH_TH and ja_JP_JP.
- *
- * <h4><a id="legacy_language_codes">Legacy language codes</a></h4>
+ * <h3><a id="legacy_language_codes">Legacy language codes</a></h3>
  *
- * <p>Locale's constructor has always converted three language codes to
+ * <p>Locale's constructors have always converted three language codes to
  * their earlier, obsoleted forms: {@code he} maps to {@code iw},
  * {@code yi} maps to {@code ji}, and {@code id} maps to
  * {@code in}. Since Java SE 17, this is no longer the case. Each
  * language maps to its new form; {@code iw} maps to {@code he}, {@code ji}
  * maps to {@code yi}, and {@code in} maps to {@code id}.
  *
- * <p>For the backward compatible behavior, the system property
+ * <p>For backwards compatible behavior, the system property
  * {@systemProperty java.locale.useOldISOCodes} reverts the behavior
  * back to that of before Java SE 17. If the system property is set to
  * {@code true}, those three current language codes are mapped to their
@@ -524,22 +554,12 @@
  * lookup mechanism also implements this mapping, so that resources
  * can be named using either convention, see {@link ResourceBundle.Control}.
  *
- * <h4>Three-letter language/country(region) codes</h4>
- *
- * <p>The Locale constructors have always specified that the language
- * and the country param be two characters in length, although in
- * practice they have accepted any length.  The specification has now
- * been relaxed to allow language codes of two to eight characters and
- * country (region) codes of two to three characters, and in
- * particular, three-letter language codes and three-digit region
- * codes as specified in the IANA Language Subtag Registry.  For
- * compatibility, the implementation still does not impose a length
- * constraint.
- *
  * @spec https://www.rfc-editor.org/info/rfc4647
  *      RFC 4647: Matching of Language Tags
  * @spec https://www.rfc-editor.org/info/rfc5646
  *      RFC 5646: Tags for Identifying Languages
+ * @spec https://unicode.org/reports/tr35/
+ *      Unicode Locale Data Markup Language
  * @see Builder
  * @see ResourceBundle
  * @see java.text.Format
@@ -1229,28 +1249,28 @@ public static synchronized void setDefault(Locale.Category category,
     }
 
     /**
-     * {@return an array of installed locales}
+     * {@return an array of available locales}
      *
      * The returned array represents the union of locales supported
-     * by the Java runtime environment and by installed
+     * by the Java runtime environment and by deployed
      * {@link java.util.spi.LocaleServiceProvider LocaleServiceProvider}
      * implementations. At a minimum, the returned array must contain a
-     * {@code Locale} instance equal to {@link Locale#ROOT Locale.ROOT} and
-     * a {@code Locale} instance equal to {@link Locale#US Locale.US}.
+     * {@code Locale} instance equal to {@link #ROOT Locale.ROOT} and
+     * a {@code Locale} instance equal to {@link #US Locale.US}.
      */
     public static Locale[] getAvailableLocales() {
         return LocaleServiceProviderPool.getAllAvailableLocales();
     }
 
     /**
-     * {@return a stream of installed locales}
+     * {@return a stream of available locales}
      *
      * The returned stream represents the union of locales supported
-     * by the Java runtime environment and by installed
+     * by the Java runtime environment and by deployed
      * {@link java.util.spi.LocaleServiceProvider LocaleServiceProvider}
      * implementations. At a minimum, the returned stream must contain a
-     * {@code Locale} instance equal to {@link Locale#ROOT Locale.ROOT} and
-     * a {@code Locale} instance equal to {@link Locale#US Locale.US}.
+     * {@code Locale} instance equal to {@link #ROOT Locale.ROOT} and
+     * a {@code Locale} instance equal to {@link #US Locale.US}.
      *
      * @implNote Unlike {@code getAvailableLocales()}, this method does
      * not create a defensive copy of the Locale array.
@@ -1532,8 +1552,8 @@ LocaleExtensions getLocaleExtensions() {
      * Java 6 and prior.
      *
      * <p>If both the language and country fields are missing, this function will return
-     * the empty string, even if the variant, script, or extensions field is present (you
-     * can't have a locale with just a variant, the variant must accompany a well-formed
+     * the empty string, even if the variant, script, or extensions field is present
+     * (a locale with just a variant is not allowed, the variant must accompany a well-formed
      * language or country code).
      *
      * <p>If script or extensions are present and variant is missing, no underscore is
@@ -1613,7 +1633,7 @@ public final String toString() {
      * (delimited by '-' or '_') is emitted as a subtag.  Otherwise:
      * <ul>
      *
-     * <li>if all sub-segments match <code>[0-9a-zA-Z]{1,8}</code>
+     * <li>if all sub-segments match {@code [0-9a-zA-Z]{1,8}}
      * (for example "WIN" or "Oracle_JDK_Standard_Edition"), the first
      * ill-formed sub-segment and all following will be appended to
      * the private use subtag.  The first appended subtag will be
@@ -1622,7 +1642,7 @@ public final String toString() {
      * "Oracle-x-lvariant-JDK-Standard-Edition".
      *
      * <li>if any sub-segment does not match
-     * <code>[0-9a-zA-Z]{1,8}</code>, the variant will be truncated
+     * {@code [0-9a-zA-Z]{1,8}}, the variant will be truncated
      * and the problematic sub-segment and all following sub-segments
      * will be omitted.  If the remainder is non-empty, it will be
      * emitted as a private use subtag as above (even if the remainder
@@ -1774,7 +1794,7 @@ public static String caseFoldLanguageTag(String languageTag) {
      *
      * <p>If the specified language tag contains any ill-formed subtags,
      * the first such subtag and all following subtags are ignored.  Compare
-     * to {@link Locale.Builder#setLanguageTag} which throws an exception
+     * to {@link Locale.Builder#setLanguageTag(String)} which throws an exception
      * in this case.
      *
      * <p>The following <b>conversions</b> are performed:<ul>
@@ -1994,7 +2014,6 @@ private static String getISO3Code(String iso2Code, String table) {
      * getDisplayLanguage() will return "anglais".
      * If the name returned cannot be localized for the default
      * {@link Locale.Category#DISPLAY DISPLAY} locale,
-     * (say, we don't have a Japanese name for Croatian),
      * this function falls back on the English name, and uses the ISO code as a last-resort
      * value.  If the locale doesn't specify a language, this function returns the empty string.
      *
@@ -2012,7 +2031,6 @@ public final String getDisplayLanguage() {
      * is en_US, getDisplayLanguage() will return "French"; if the locale is en_US and
      * inLocale is fr_FR, getDisplayLanguage() will return "anglais".
      * If the name returned cannot be localized according to inLocale,
-     * (say, we don't have a Japanese name for Croatian),
      * this function falls back on the English name, and finally
      * on the ISO code as a last-resort value.  If the locale doesn't specify a language,
      * this function returns the empty string.
@@ -2067,7 +2085,6 @@ public String getDisplayScript(Locale inLocale) {
      * getDisplayCountry() will return "Etats-Unis".
      * If the name returned cannot be localized for the default
      * {@link Locale.Category#DISPLAY DISPLAY} locale,
-     * (say, we don't have a Japanese name for Croatia),
      * this function falls back on the English name, and uses the ISO code as a last-resort
      * value.  If the locale doesn't specify a country, this function returns the empty string.
      *
@@ -2084,8 +2101,7 @@ public final String getDisplayCountry() {
      * For example, if the locale is fr_FR and inLocale
      * is en_US, getDisplayCountry() will return "France"; if the locale is en_US and
      * inLocale is fr_FR, getDisplayCountry() will return "Etats-Unis".
-     * If the name returned cannot be localized according to inLocale.
-     * (say, we don't have a Japanese name for Croatia),
+     * If the name returned cannot be localized according to inLocale,
      * this function falls back on the English name, and finally
      * on the ISO code as a last-resort value.  If the locale doesn't specify a country,
      * this function returns the empty string.
@@ -2697,7 +2713,7 @@ public enum Category {
      * alphanumerics.  The method {@code setVariant} throws
      * {@code IllformedLocaleException} for a variant that does not satisfy
      * this restriction. If it is necessary to support such a variant, use
-     * {@link Locale#of(String, String, String)}.  However, keep in mind that a {@code Locale}
+     * {@link #of(String, String, String)}.  However, keep in mind that a {@code Locale}
      * object obtained this way might lose the variant information when
      * transformed to a BCP 47 language tag.
      *
@@ -2710,7 +2726,7 @@ public enum Category {
      * <p>Builders can be reused; {@code clear()} resets all
      * fields to their default values.
      *
-     * @see Locale#forLanguageTag
+     * @see Locale#forLanguageTag(String)
      * @see Locale#of(String, String, String)
      * @since 1.7
      */
@@ -2760,7 +2776,7 @@ public Builder setLocale(Locale locale) {
          * language tag.  Discards the existing state.  Null and the
          * empty string cause the builder to be reset, like {@link
          * #clear}.  Legacy tags (see {@link
-         * Locale#forLanguageTag}) are converted to their canonical
+         * Locale#forLanguageTag(String)}) are converted to their canonical
          * form before being processed.  Otherwise, the language tag
          * must be well-formed (see {@link Locale}) or an exception is
          * thrown (unlike {@code Locale.forLanguageTag}, which
@@ -2862,7 +2878,7 @@ public Builder setRegion(String region) {
          * the {@code Locale} class does not impose any syntactic
          * restriction on variant, and the variant value in
          * {@code Locale} is case sensitive.  To set such a variant,
-         * use {@link Locale#of(String, String, String)}.
+         * use {@link #of(String, String, String)}.
          *
          * @param variant the variant
          * @return This builder.
@@ -2884,12 +2900,12 @@ public Builder setVariant(String variant) {
          * must be {@linkplain Locale##def_extensions well-formed} or an exception
          * is thrown.
          *
-         * <p><b>Note:</b> The key {@link Locale#UNICODE_LOCALE_EXTENSION
+         * <p><b>Note:</b> The key {@link #UNICODE_LOCALE_EXTENSION
          * UNICODE_LOCALE_EXTENSION} ('u') is used for the Unicode locale extension.
          * Setting a value for this key replaces any existing Unicode locale key/type
          * pairs with those defined in the extension.
          *
-         * <p><b>Note:</b> The key {@link Locale#PRIVATE_USE_EXTENSION
+         * <p><b>Note:</b> The key {@link #PRIVATE_USE_EXTENSION
          * PRIVATE_USE_EXTENSION} ('x') is used for the private use code. To be
          * well-formed, the value for this key needs only to have subtags of one to
          * eight alphanumeric characters, not two to eight as in the general case.
@@ -2918,7 +2934,7 @@ public Builder setExtension(char key, String value) {
          *
          * <p>Keys and types are converted to lower case.
          *
-         * <p><b>Note</b>:Setting the 'u' extension via {@link #setExtension}
+         * <p><b>Note</b>:Setting the 'u' extension via {@link #setExtension(char, String)}
          * replaces all Unicode locale keywords with those defined in the
          * extension.
          *
@@ -3010,9 +3026,9 @@ public Builder clearExtensions() {
          * Returns an instance of {@code Locale} obtained from the fields set
          * on this builder.
          *
-         * <p>This applies the conversions listed in {@link Locale#forLanguageTag}
+         * <p>This applies the conversions listed in {@link #forLanguageTag(String)}
          * when constructing a Locale. (Legacy tags are handled in
-         * {@link #setLanguageTag}.)
+         * {@link #setLanguageTag(String)}.)
          *
          * @return A Locale.
          */
@@ -3193,10 +3209,10 @@ public static enum FilteringMode {
      *
      * @spec https://www.rfc-editor.org/info/rfc4234 RFC 4234: Augmented BNF for Syntax Specifications: ABNF
      * @spec https://www.rfc-editor.org/info/rfc4647 RFC 4647: Matching of Language Tags
-     * @see #filter
-     * @see #filterTags
-     * @see #lookup
-     * @see #lookupTag
+     * @see #filter(List, Collection, FilteringMode)
+     * @see #filterTags(List, Collection, FilteringMode)
+     * @see #lookup(List, Collection)
+     * @see #lookupTag(List, Collection)
      *
      * @since 1.8
      */
@@ -3413,7 +3429,7 @@ public static List<LanguageRange> parse(String ranges) {
          *     found in the given {@code ranges} is ill-formed
          * @spec https://www.rfc-editor.org/info/rfc2616 RFC 2616: Hypertext Transfer Protocol -- HTTP/1.1
          * @see #parse(String)
-         * @see #mapEquivalents
+         * @see #mapEquivalents(List, Map)
          */
         public static List<LanguageRange> parse(String ranges,
                                                 Map<String, List<String>> map) {
diff --git a/src/java.base/share/classes/javax/crypto/JceSecurity.java.template b/src/java.base/share/classes/javax/crypto/JceSecurity.java.template
index 8b64b452b11..01282394b57 100644
--- a/src/java.base/share/classes/javax/crypto/JceSecurity.java.template
+++ b/src/java.base/share/classes/javax/crypto/JceSecurity.java.template
@@ -290,7 +290,6 @@ final class JceSecurity {
         }
     }
 
-    // This is called from within an doPrivileged block.
     private static void setupJurisdictionPolicies() throws Exception {
 
         // Sanity check the crypto.policy Security property.  Single
diff --git a/src/java.base/share/classes/javax/security/auth/Subject.java b/src/java.base/share/classes/javax/security/auth/Subject.java
index 97ab672e1cc..ceb860e653a 100644
--- a/src/java.base/share/classes/javax/security/auth/Subject.java
+++ b/src/java.base/share/classes/javax/security/auth/Subject.java
@@ -453,7 +453,7 @@ public static <T> T doAs(final Subject subject,
     }
 
     /**
-     * Perform privileged work as a particular {@code Subject}.
+     * Perform work as a particular {@code Subject}.
      *
      * <p> This method launches {@code action} and binds {@code subject} to
      * the period of its execution.
@@ -513,7 +513,7 @@ public static <T> T doAsPrivileged(final Subject subject,
     }
 
     /**
-     * Perform privileged work as a particular {@code Subject}.
+     * Perform work as a particular {@code Subject}.
      *
      * <p> This method launches {@code action} and binds {@code subject} to
      * the period of its execution.
diff --git a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
index bab2c5b9da9..643aea9e93c 100644
--- a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
+++ b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
@@ -112,21 +112,16 @@ public Subject getSubject() {
      * In addition, caching of ProtectionDomains may be permitted.
      *
      * @param currentDomains the ProtectionDomains associated with the
-     *          current execution Thread, up to the most recent
-     *          privileged {@code ProtectionDomain}.
+     *          current execution Thread.
      *          The ProtectionDomains are listed in order of execution,
      *          with the most recently executing {@code ProtectionDomain}
      *          residing at the beginning of the array. This parameter may
      *          be {@code null} if the current execution Thread
      *          has no associated ProtectionDomains.
      *
-     * @param assignedDomains the ProtectionDomains inherited from the
-     *          parent Thread, or the ProtectionDomains from the
-     *          privileged {@code context}, if a call to
-     *          {@code AccessController.doPrivileged(..., context)}
-     *          had occurred  This parameter may be {@code null}
-     *          if there were no ProtectionDomains inherited from the
-     *          parent Thread, or from the privileged {@code context}.
+     * @param assignedDomains the inherited ProtectionDomains.
+     *          This parameter may be {@code null}
+     *          if there were no inherited ProtectionDomains.
      *
      * @return a new array consisting of the updated ProtectionDomains,
      *          or {@code null}.
diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
index 43a1daf762c..8d483507203 100644
--- a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
+++ b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
@@ -39,10 +39,7 @@
 import java.io.FileDescriptor;
 import java.io.FilePermission;
 import java.io.ObjectInputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
 import java.io.RandomAccessFile;
-import java.security.ProtectionDomain;
 import java.security.Signature;
 import javax.security.auth.x500.X500Principal;
 
@@ -89,7 +86,6 @@ public class SharedSecrets {
     private static JavaUtilJarAccess javaUtilJarAccess;
     private static JavaUtilZipFileAccess javaUtilZipFileAccess;
     private static JavaUtilResourceBundleAccess javaUtilResourceBundleAccess;
-    private static JavaSecurityAccess javaSecurityAccess;
     private static JavaSecurityPropertiesAccess javaSecurityPropertiesAccess;
     private static JavaSecuritySignatureAccess javaSecuritySignatureAccess;
     private static JavaSecuritySpecAccess javaSecuritySpecAccess;
@@ -313,19 +309,6 @@ public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() {
         return access;
     }
 
-    public static void setJavaSecurityAccess(JavaSecurityAccess jsa) {
-        javaSecurityAccess = jsa;
-    }
-
-    public static JavaSecurityAccess getJavaSecurityAccess() {
-        var access = javaSecurityAccess;
-        if (access == null) {
-            ensureClassInitialized(ProtectionDomain.class);
-            access = javaSecurityAccess;
-        }
-        return access;
-    }
-
     public static void setJavaSecurityPropertiesAccess(JavaSecurityPropertiesAccess jspa) {
         javaSecurityPropertiesAccess = jspa;
     }
diff --git a/src/java.base/share/classes/java/lang/classfile/components/ClassPrinter.java b/src/java.base/share/classes/jdk/internal/classfile/components/ClassPrinter.java
similarity index 97%
rename from src/java.base/share/classes/java/lang/classfile/components/ClassPrinter.java
rename to src/java.base/share/classes/jdk/internal/classfile/components/ClassPrinter.java
index 7237dc54580..cc5a3824936 100644
--- a/src/java.base/share/classes/java/lang/classfile/components/ClassPrinter.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/components/ClassPrinter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.classfile.components;
+package jdk.internal.classfile.components;
 
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.CodeModel;
@@ -58,8 +58,6 @@
  * <p>
  * Another use case for {@link ClassPrinter} is to simplify writing of automated tests:
  * {@snippet lang="java" class="PackageSnippets" region="printNodesInTest"}
- *
- * @since 24
  */
 public final class ClassPrinter {
 
@@ -68,8 +66,6 @@ private ClassPrinter() {
 
     /**
      * Level of detail to print or export.
-     *
-     * @since 24
      */
     public enum Verbosity {
 
@@ -102,8 +98,6 @@ public enum Verbosity {
 
     /**
      * Named, traversable, and printable node parent.
-     *
-     * @since 24
      */
     public sealed interface Node {
 
@@ -146,8 +140,6 @@ default void toYaml(Consumer<String> out) {
 
     /**
      * A leaf node holding single printable value.
-     *
-     * @since 24
      */
     public sealed interface LeafNode extends Node
             permits ClassPrinterImpl.LeafNodeImpl {
@@ -161,8 +153,6 @@ public sealed interface LeafNode extends Node
 
     /**
      * A tree node holding {@link List} of nested nodes.
-     *
-     * @since 24
      */
     public sealed interface ListNode extends Node, List<Node>
             permits ClassPrinterImpl.ListNodeImpl {
@@ -172,8 +162,6 @@ public sealed interface ListNode extends Node, List<Node>
      * A tree node holding {@link Map} of nested nodes.
      * <p>
      * Each {@link Map.Entry#getKey()} == {@link Map.Entry#getValue()}.{@link #name()}.
-     *
-     * @since 24
      */
     public sealed interface MapNode extends Node, Map<ConstantDesc, Node>
             permits ClassPrinterImpl.MapNodeImpl {
diff --git a/src/java.base/share/classes/java/lang/classfile/components/ClassRemapper.java b/src/java.base/share/classes/jdk/internal/classfile/components/ClassRemapper.java
similarity index 98%
rename from src/java.base/share/classes/java/lang/classfile/components/ClassRemapper.java
rename to src/java.base/share/classes/jdk/internal/classfile/components/ClassRemapper.java
index 4a2808ad4f0..ad116cd9dc4 100644
--- a/src/java.base/share/classes/java/lang/classfile/components/ClassRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/components/ClassRemapper.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.classfile.components;
+package jdk.internal.classfile.components;
 
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.ClassModel;
@@ -53,8 +53,6 @@
  * <p>
  * Arrays of reference types are always decomposed, mapped as the base reference
  * types and composed back to arrays.
- *
- * @since 24
  */
 public sealed interface ClassRemapper extends ClassTransform permits ClassRemapperImpl {
 
diff --git a/src/java.base/share/classes/java/lang/classfile/components/CodeLocalsShifter.java b/src/java.base/share/classes/jdk/internal/classfile/components/CodeLocalsShifter.java
similarity index 97%
rename from src/java.base/share/classes/java/lang/classfile/components/CodeLocalsShifter.java
rename to src/java.base/share/classes/jdk/internal/classfile/components/CodeLocalsShifter.java
index 9db85f54a45..f06b4694953 100644
--- a/src/java.base/share/classes/java/lang/classfile/components/CodeLocalsShifter.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/components/CodeLocalsShifter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.classfile.components;
+package jdk.internal.classfile.components;
 
 import java.lang.classfile.AccessFlags;
 import java.lang.classfile.CodeTransform;
@@ -37,8 +37,6 @@
  * newly allocated positions to avoid conflicts during code injection.
  * Locals pointing to the receiver or to method arguments slots are never shifted.
  * All locals pointing beyond the method arguments are re-indexed in order of appearance.
- *
- * @since 24
  */
 public sealed interface CodeLocalsShifter extends CodeTransform permits CodeLocalsShifterImpl {
 
diff --git a/src/java.base/share/classes/java/lang/classfile/components/CodeRelabeler.java b/src/java.base/share/classes/jdk/internal/classfile/components/CodeRelabeler.java
similarity index 98%
rename from src/java.base/share/classes/java/lang/classfile/components/CodeRelabeler.java
rename to src/java.base/share/classes/jdk/internal/classfile/components/CodeRelabeler.java
index 4ef82adfdb9..6a16b6a00dd 100644
--- a/src/java.base/share/classes/java/lang/classfile/components/CodeRelabeler.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/components/CodeRelabeler.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.classfile.components;
+package jdk.internal.classfile.components;
 
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CodeTransform;
@@ -44,8 +44,6 @@
  * Primary purpose of CodeRelabeler is for repeated injections of the same code blocks.
  * Repeated injection of the same code block must be relabeled, so each instance of
  * {@link java.lang.classfile.Label} is bound in the target bytecode exactly once.
- *
- * @since 24
  */
 public sealed interface CodeRelabeler extends CodeTransform permits CodeRelabelerImpl {
 
diff --git a/src/java.base/share/classes/java/lang/classfile/components/CodeStackTracker.java b/src/java.base/share/classes/jdk/internal/classfile/components/CodeStackTracker.java
similarity index 98%
rename from src/java.base/share/classes/java/lang/classfile/components/CodeStackTracker.java
rename to src/java.base/share/classes/jdk/internal/classfile/components/CodeStackTracker.java
index 3761e53ff19..eb7f58702eb 100644
--- a/src/java.base/share/classes/java/lang/classfile/components/CodeStackTracker.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/components/CodeStackTracker.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.classfile.components;
+package jdk.internal.classfile.components;
 
 import java.lang.classfile.CodeTransform;
 import java.lang.classfile.Label;
@@ -49,8 +49,6 @@
  *         int maxStack = stackTracker.maxStackSize().get();
  *     });
  * }
- *
- * @since 24
  */
 public sealed interface CodeStackTracker extends CodeTransform permits CodeStackTrackerImpl {
 
diff --git a/src/java.base/share/classes/java/lang/classfile/components/package-info.java b/src/java.base/share/classes/jdk/internal/classfile/components/package-info.java
similarity index 98%
rename from src/java.base/share/classes/java/lang/classfile/components/package-info.java
rename to src/java.base/share/classes/jdk/internal/classfile/components/package-info.java
index be650f4c77c..30fb5fc07e5 100644
--- a/src/java.base/share/classes/java/lang/classfile/components/package-info.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/components/package-info.java
@@ -110,8 +110,6 @@
  * CodeLocalsShifter} and {@link CodeRelabeler} into fully functional class
  * instrumenting transformation:
  * {@snippet lang="java" class="PackageSnippets" region="classInstrumentation"}
- *
- * @since 24
  */
-package java.lang.classfile.components;
+package jdk.internal.classfile.components;
 
diff --git a/src/java.base/share/classes/java/lang/classfile/components/snippet-files/PackageSnippets.java b/src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java
similarity index 97%
rename from src/java.base/share/classes/java/lang/classfile/components/snippet-files/PackageSnippets.java
rename to src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java
index 87c2146a7ac..452e0188115 100644
--- a/src/java.base/share/classes/java/lang/classfile/components/snippet-files/PackageSnippets.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java
@@ -25,10 +25,10 @@
 package java.lang.classfile.components.snippets;
 
 import java.lang.classfile.*;
-import java.lang.classfile.components.ClassPrinter;
-import java.lang.classfile.components.ClassRemapper;
-import java.lang.classfile.components.CodeLocalsShifter;
-import java.lang.classfile.components.CodeRelabeler;
+import jdk.internal.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassRemapper;
+import jdk.internal.classfile.components.CodeLocalsShifter;
+import jdk.internal.classfile.components.CodeRelabeler;
 import java.lang.classfile.instruction.InvokeInstruction;
 import java.lang.classfile.instruction.ReturnInstruction;
 import java.lang.classfile.instruction.StoreInstruction;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java
index 183ee323b52..8a44890fe66 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java
@@ -31,11 +31,11 @@
 import java.lang.classfile.attribute.StackMapFrameInfo.SimpleVerificationTypeInfo;
 import java.lang.classfile.attribute.StackMapFrameInfo.UninitializedVerificationTypeInfo;
 import java.lang.classfile.attribute.StackMapFrameInfo.VerificationTypeInfo;
-import java.lang.classfile.components.ClassPrinter.LeafNode;
-import java.lang.classfile.components.ClassPrinter.ListNode;
-import java.lang.classfile.components.ClassPrinter.MapNode;
-import java.lang.classfile.components.ClassPrinter.Node;
-import java.lang.classfile.components.ClassPrinter.Verbosity;
+import jdk.internal.classfile.components.ClassPrinter.LeafNode;
+import jdk.internal.classfile.components.ClassPrinter.ListNode;
+import jdk.internal.classfile.components.ClassPrinter.MapNode;
+import jdk.internal.classfile.components.ClassPrinter.Node;
+import jdk.internal.classfile.components.ClassPrinter.Verbosity;
 import java.lang.classfile.constantpool.*;
 import java.lang.classfile.instruction.*;
 import java.lang.constant.ConstantDesc;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
index cd9faaf2f9a..6dbde898ee5 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
@@ -26,7 +26,7 @@
 
 import java.lang.classfile.*;
 import java.lang.classfile.attribute.*;
-import java.lang.classfile.components.ClassRemapper;
+import jdk.internal.classfile.components.ClassRemapper;
 import java.lang.classfile.constantpool.Utf8Entry;
 import java.lang.classfile.instruction.ConstantInstruction.LoadConstantInstruction;
 import java.lang.classfile.instruction.*;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeLocalsShifterImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeLocalsShifterImpl.java
index 7b7d04a8f1d..eac66b7cb5e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeLocalsShifterImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeLocalsShifterImpl.java
@@ -28,7 +28,7 @@
 import java.lang.classfile.CodeElement;
 import java.lang.classfile.Signature;
 import java.lang.classfile.TypeKind;
-import java.lang.classfile.components.CodeLocalsShifter;
+import jdk.internal.classfile.components.CodeLocalsShifter;
 import java.lang.classfile.instruction.IncrementInstruction;
 import java.lang.classfile.instruction.LoadInstruction;
 import java.lang.classfile.instruction.LocalVariable;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java
index af0a59978d7..1e7e5262af4 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java
@@ -27,7 +27,7 @@
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CodeElement;
 import java.lang.classfile.Label;
-import java.lang.classfile.components.CodeRelabeler;
+import jdk.internal.classfile.components.CodeRelabeler;
 import java.lang.classfile.instruction.*;
 import java.util.function.BiFunction;
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeStackTrackerImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeStackTrackerImpl.java
index 2746caae004..5441f78518e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeStackTrackerImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeStackTrackerImpl.java
@@ -29,7 +29,7 @@
 import java.lang.classfile.Label;
 import java.lang.classfile.Opcode;
 import java.lang.classfile.TypeKind;
-import java.lang.classfile.components.CodeStackTracker;
+import jdk.internal.classfile.components.CodeStackTracker;
 import java.lang.classfile.instruction.*;
 import java.util.*;
 import java.util.function.Consumer;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
index fc6099f3e5b..b0234fb88cc 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
@@ -26,7 +26,7 @@
 
 import java.lang.classfile.*;
 import java.lang.classfile.attribute.CodeAttribute;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.constantpool.ModuleEntry;
 import java.lang.classfile.constantpool.PoolEntry;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
index ed93ff1fc5d..4c2104c5a78 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
@@ -26,7 +26,7 @@
 
 import java.lang.classfile.ClassHierarchyResolver;
 import java.lang.classfile.ClassModel;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java b/src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java
index 02dc79f0288..44eaab0e83a 100644
--- a/src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java
+++ b/src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java
@@ -30,8 +30,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.function.BiFunction;
@@ -323,18 +321,13 @@ boolean open() {
             return load(this, name, isBuiltin, throwExceptionIfFail());
         }
 
-        @SuppressWarnings("removal")
         private boolean throwExceptionIfFail() {
             if (loadLibraryOnlyIfPresent) return true;
 
             // If the file exists but fails to load, UnsatisfiedLinkException thrown by the VM
             // will include the error message from dlopen to provide diagnostic information
-            return AccessController.doPrivileged(new PrivilegedAction<>() {
-                public Boolean run() {
-                    File file = new File(name);
-                    return file.exists();
-                }
-            });
+            File file = new File(name);
+            return file.exists();
         }
 
         /*
diff --git a/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java b/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java
index 885e2e8c4d7..628d768d9ce 100644
--- a/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java
+++ b/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java
@@ -342,8 +342,6 @@ private static LoggerFinder accessLoggerFinder() {
             // no need to lock: it doesn't matter if we call
             // getLoggerFinder() twice - since LoggerFinder already caches
             // the result.
-            // This is just an optimization to avoid the cost of calling
-            // doPrivileged every time.
             prov = LoggerFinder.getLoggerFinder();
             if (prov instanceof TemporaryLoggerFinder) return prov;
             provider = prov;
diff --git a/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java b/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
index ca2fcf11e99..4f7811faf34 100644
--- a/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
+++ b/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
@@ -28,10 +28,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * A thread that has no permissions, is not a member of any user-defined
+ * A thread that is not a member of any user-defined
  * ThreadGroup and supports the ability to erase ThreadLocals.
  */
-@SuppressWarnings("removal")
 public final class InnocuousThread extends Thread {
     private static final jdk.internal.misc.Unsafe UNSAFE;
     private static final long THREAD_LOCALS;
diff --git a/src/java.base/share/classes/jdk/internal/perf/Perf.java b/src/java.base/share/classes/jdk/internal/perf/Perf.java
index e764fe79273..ada89dcf2e0 100644
--- a/src/java.base/share/classes/jdk/internal/perf/Perf.java
+++ b/src/java.base/share/classes/jdk/internal/perf/Perf.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
@@ -25,8 +25,6 @@
 package jdk.internal.perf;
 
 import java.nio.ByteBuffer;
-import java.security.Permission;
-import java.security.PrivilegedAction;
 import java.io.IOException;
 
 import sun.nio.cs.UTF_8;
@@ -49,7 +47,6 @@
  * @author   Brian Doherty
  * @since    1.4.2
  * @see      #getPerf
- * @see      jdk.internal.perf.Perf.GetPerfAction
  * @see      java.nio.ByteBuffer
  */
 public final class Perf {
@@ -58,46 +55,6 @@ public final class Perf {
 
     private Perf() { }    // prevent instantiation
 
-    /**
-     * The GetPerfAction class is a convenience class for acquiring access
-     * to the singleton Perf instance using the
-     * <code>AccessController.doPrivileged()</code> method.
-     * <p>
-     * An instance of this class can be used as the argument to
-     * <code>AccessController.doPrivileged(PrivilegedAction)</code>.
-     * <p> Here is a suggested idiom for use of this class:
-     *
-     * <blockquote><pre>{@code
-     * class MyTrustedClass {
-     *   private static final Perf perf =
-     *       AccessController.doPrivileged(new Perf.GetPerfAction<Perf>());
-     *   ...
-     * }
-     * }</pre></blockquote>
-     * <p>
-     * In the presence of a security manager, the <code>MyTrustedClass</code>
-     * class in the above example will need to be granted the
-     * <em>"sun.misc.Perf.getPerf"</em> <code>RuntimePermission</code>
-     * permission in order to successfully acquire the singleton Perf instance.
-     * <p>
-     * Please note that the <em>"sun.misc.Perf.getPerf"</em> permission
-     * is not a JDK specified permission.
-     *
-     * @see  java.security.AccessController#doPrivileged(PrivilegedAction)
-     * @see  java.lang.RuntimePermission
-     */
-    public static class GetPerfAction implements PrivilegedAction<Perf>
-    {
-        /**
-         * Run the <code>Perf.getPerf()</code> method in a privileged context.
-         *
-         * @see #getPerf
-         */
-        public Perf run() {
-            return getPerf();
-        }
-    }
-
     /**
      * Return a reference to the singleton Perf instance.
      * <p>
@@ -106,11 +63,6 @@ public Perf run() {
      * for accessing the instrumentation buffer for this or another local
      * Java virtual machine.
      * <p>
-     * If a security manager is installed, its <code>checkPermission</code>
-     * method is called with a <code>RuntimePermission</code> with a target
-     * of <em>"sun.misc.Perf.getPerf"</em>. A security exception will result
-     * if the caller has not been granted this permission.
-     * <p>
      * Access to the returned <code>Perf</code> object should be protected
      * by its caller and not passed on to untrusted code. This object can
      * be used to attach to the instrumentation buffer provided by this Java
@@ -119,26 +71,12 @@ public Perf run() {
      * information. API's built on top of this interface may want to provide
      * finer grained access control to the contents of individual
      * instrumentation objects contained within the buffer.
-     * <p>
-     * Please note that the <em>"sun.misc.Perf.getPerf"</em> permission
-     * is not a JDK specified permission.
      *
      * @return  A reference to the singleton Perf instance.
-     * @throws SecurityException  if a security manager exists and its
-     *         <code>checkPermission</code> method doesn't allow access
-     *         to the <em>"jdk.internal.perf.Perf.getPerf""</em> target.
-     * @see  java.lang.RuntimePermission
      * @see  #attach
      */
     public static Perf getPerf()
     {
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            Permission perm = new RuntimePermission("jdk.internal.perf.Perf.getPerf");
-            security.checkPermission(perm);
-        }
-
         return instance;
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java b/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java
index b0a87c207b1..dfe67ce849c 100644
--- a/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java
+++ b/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.LongBuffer;
-import java.security.AccessController;
 
 /**
  * Performance counter support for internal JRE classes.
@@ -48,9 +47,7 @@
  *
  */
 public class PerfCounter {
-    @SuppressWarnings("removal")
-    private static final Perf perf =
-        AccessController.doPrivileged(new Perf.GetPerfAction());
+    private static final Perf perf = Perf.getPerf();
 
     // Must match values defined in hotspot/src/share/vm/runtime/perfdata.hpp
     private static final int V_Constant  = 1;
diff --git a/src/java.base/share/classes/jdk/internal/ref/Cleaner.java b/src/java.base/share/classes/jdk/internal/ref/Cleaner.java
index 3a02605577b..ecd1c32167f 100644
--- a/src/java.base/share/classes/jdk/internal/ref/Cleaner.java
+++ b/src/java.base/share/classes/jdk/internal/ref/Cleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, 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
@@ -26,8 +26,6 @@
 package jdk.internal.ref;
 
 import java.lang.ref.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 
 /**
@@ -136,21 +134,17 @@ public static Cleaner create(Object ob, Runnable thunk) {
     /**
      * Runs this cleaner, if it has not been run before.
      */
-    @SuppressWarnings("removal")
     public void clean() {
         if (!remove(this))
             return;
         try {
             thunk.run();
         } catch (final Throwable x) {
-            AccessController.doPrivileged(new PrivilegedAction<>() {
-                    public Void run() {
-                        if (System.err != null)
-                            new Error("Cleaner terminated abnormally", x)
-                                .printStackTrace();
-                        System.exit(1);
-                        return null;
-                    }});
+            if (System.err != null) {
+                new Error("Cleaner terminated abnormally", x)
+                        .printStackTrace();
+            }
+            System.exit(1);
         }
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java b/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
index b4565daa466..bb7293e5d2b 100644
--- a/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
+++ b/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
@@ -48,9 +48,9 @@ public final class CleanerImpl implements Runnable {
     private static Function<Cleaner, CleanerImpl> cleanerImplAccess = null;
 
     /**
-     * Heads of a CleanableList for each reference type.
+     * Currently active PhantomCleanable-s.
      */
-    final PhantomCleanable<?> phantomCleanableList;
+    final CleanableList activeList;
 
     // The ReferenceQueue of pending cleaning actions
     final ReferenceQueue<Object> queue;
@@ -82,7 +82,7 @@ static CleanerImpl getCleanerImpl(Cleaner cleaner) {
      */
     public CleanerImpl() {
         queue = new ReferenceQueue<>();
-        phantomCleanableList = new PhantomCleanableRef();
+        activeList = new CleanableList();
     }
 
     /**
@@ -129,7 +129,7 @@ public void run() {
         InnocuousThread mlThread = (t instanceof InnocuousThread)
                 ? (InnocuousThread) t
                 : null;
-        while (!phantomCleanableList.isListEmpty()) {
+        while (!activeList.isEmpty()) {
             if (mlThread != null) {
                 // Clear the thread locals
                 mlThread.eraseThreadLocals();
@@ -165,14 +165,6 @@ public PhantomCleanableRef(Object obj, Cleaner cleaner, Runnable action) {
             this.action = action;
         }
 
-        /**
-         * Constructor used only for root of phantom cleanable list.
-         */
-        PhantomCleanableRef() {
-            super();
-            this.action = null;
-        }
-
         @Override
         protected void performCleanup() {
             action.run();
@@ -231,4 +223,137 @@ protected void performCleanup() {
             // no action
         }
     }
+
+    /**
+     * A specialized implementation that tracks phantom cleanables.
+     */
+    static final class CleanableList {
+        /**
+         * Capacity for a single node in the list.
+         * This balances memory overheads vs locality vs GC walking costs.
+         */
+        static final int NODE_CAPACITY = 4096;
+
+        /**
+         * Head node. This is the only node where PhantomCleanables are
+         * added to or removed from. This is the only node with variable size,
+         * all other nodes linked from the head are always at full capacity.
+         */
+        private Node head;
+
+        /**
+         * Cached node instance to provide better behavior near NODE_CAPACITY
+         * threshold: if list size flips around NODE_CAPACITY, it would reuse
+         * the cached node instead of wasting and re-allocating a new node all
+         * the time.
+         */
+        private Node cache;
+
+        public CleanableList() {
+            reset();
+        }
+
+        /**
+         * Testing support: reset list to initial state.
+         */
+        synchronized void reset() {
+            this.head = new Node();
+        }
+
+        /**
+         * Returns true if cleanable list is empty.
+         *
+         * @return true if the list is empty
+         */
+        public synchronized boolean isEmpty() {
+            // Head node size is zero only when the entire list is empty.
+            return head.size == 0;
+        }
+
+        /**
+         * Insert this PhantomCleanable in the list.
+         */
+        public synchronized void insert(PhantomCleanable<?> phc) {
+            if (head.size == NODE_CAPACITY) {
+                // Head node is full, insert new one.
+                // If possible, pick a pre-allocated node from cache.
+                Node newHead;
+                if (cache != null) {
+                    newHead = cache;
+                    cache = null;
+                } else {
+                    newHead = new Node();
+                }
+                newHead.next = head;
+                head = newHead;
+            }
+            assert head.size < NODE_CAPACITY;
+
+            // Put the incoming object in head node and record indexes.
+            final int lastIndex = head.size;
+            phc.node = head;
+            phc.index = lastIndex;
+            head.arr[lastIndex] = phc;
+            head.size++;
+        }
+
+        /**
+         * Remove this PhantomCleanable from the list.
+         *
+         * @return true if Cleanable was removed or false if not because
+         * it had already been removed before
+         */
+        public synchronized boolean remove(PhantomCleanable<?> phc) {
+            if (phc.node == null) {
+                // Not in the list.
+                return false;
+            }
+            assert phc.node.arr[phc.index] == phc;
+
+            // Replace with another element from the head node, as long
+            // as it is not the same element. This keeps all non-head
+            // nodes at full capacity.
+            final int lastIndex = head.size - 1;
+            assert lastIndex >= 0;
+            if (head != phc.node || (phc.index != lastIndex)) {
+                PhantomCleanable<?> mover = head.arr[lastIndex];
+                mover.node = phc.node;
+                mover.index = phc.index;
+                phc.node.arr[phc.index] = mover;
+            }
+
+            // Now we can unlink the removed element.
+            phc.node = null;
+
+            // Remove the last element from the head node.
+            head.arr[lastIndex] = null;
+            head.size--;
+
+            // If head node becomes empty after this, and there are
+            // nodes that follow it, replace the head node with another
+            // full one. If needed, stash the now free node in cache.
+            if (head.size == 0 && head.next != null) {
+                Node newHead = head.next;
+                if (cache == null) {
+                    cache = head;
+                    cache.next = null;
+                }
+                head = newHead;
+            }
+
+            return true;
+        }
+
+        /**
+         * Segment node.
+         */
+        static class Node {
+            // Array of tracked cleanables, and the amount of elements in it.
+            final PhantomCleanable<?>[] arr = new PhantomCleanable<?>[NODE_CAPACITY];
+            int size;
+
+            // Linked list structure.
+            Node next;
+        }
+    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java b/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java
index 24db6d8ef9a..3564a16d0a0 100644
--- a/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java
+++ b/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java
@@ -44,14 +44,21 @@ public abstract class PhantomCleanable<T> extends PhantomReference<T>
         implements Cleaner.Cleanable {
 
     /**
-     * Links to previous and next in a doubly-linked list.
+     * The list of PhantomCleanable; synchronizes insert and remove.
      */
-    PhantomCleanable<?> prev = this, next = this;
+    private final CleanerImpl.CleanableList list;
 
     /**
-     * The list of PhantomCleanable; synchronizes insert and remove.
+     * Node for this PhantomCleanable in the list.
+     * Synchronized by the same lock as the list itself.
      */
-    private final PhantomCleanable<?> list;
+    CleanerImpl.CleanableList.Node node;
+
+    /**
+     * Index of this PhantomCleanable in the list node.
+     * Synchronized by the same lock as the list itself.
+     */
+    int index;
 
     /**
      * Constructs new {@code PhantomCleanable} with
@@ -62,73 +69,29 @@ public abstract class PhantomCleanable<T> extends PhantomReference<T>
      * @param referent the referent to track
      * @param cleaner  the {@code Cleaner} to register with
      */
+    @SuppressWarnings("this-escape")
     public PhantomCleanable(T referent, Cleaner cleaner) {
         super(Objects.requireNonNull(referent), CleanerImpl.getCleanerImpl(cleaner).queue);
-        this.list = CleanerImpl.getCleanerImpl(cleaner).phantomCleanableList;
-        insert();
+        index = -1;
+        list = CleanerImpl.getCleanerImpl(cleaner).activeList;
+        list.insert(this);
+
+        // Check that list insertion populated the backlinks.
+        assert node != null;
+        assert index >= 0;
 
         // Ensure referent and cleaner remain accessible
         Reference.reachabilityFence(referent);
         Reference.reachabilityFence(cleaner);
     }
 
-    /**
-     * Construct a new root of the list; not inserted.
-     */
-    PhantomCleanable() {
-        super(null, null);
-        this.list = this;
-    }
-
-    /**
-     * Insert this PhantomCleanable after the list head.
-     */
-    private void insert() {
-        synchronized (list) {
-            prev = list;
-            next = list.next;
-            next.prev = this;
-            list.next = this;
-        }
-    }
-
-    /**
-     * Remove this PhantomCleanable from the list.
-     *
-     * @return true if Cleanable was removed or false if not because
-     * it had already been removed before
-     */
-    private boolean remove() {
-        synchronized (list) {
-            if (next != this) {
-                next.prev = prev;
-                prev.next = next;
-                prev = this;
-                next = this;
-                return true;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Returns true if the list's next reference refers to itself.
-     *
-     * @return true if the list is empty
-     */
-    boolean isListEmpty() {
-        synchronized (list) {
-            return list == list.next;
-        }
-    }
-
     /**
      * Unregister this PhantomCleanable and invoke {@link #performCleanup()},
      * ensuring at-most-once semantics.
      */
     @Override
     public final void clean() {
-        if (remove()) {
+        if (list.remove(this)) {
             super.clear();
             performCleanup();
         }
@@ -140,7 +103,7 @@ public final void clean() {
      */
     @Override
     public void clear() {
-        if (remove()) {
+        if (list.remove(this)) {
             super.clear();
         }
     }
diff --git a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
index 687e32cdf61..20b390855c9 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
@@ -41,7 +41,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
-import java.security.PrivilegedAction;
 import java.util.Set;
 
 import jdk.internal.access.JavaLangReflectAccess;
@@ -75,22 +74,6 @@ private ReflectionFactory() {
         this.langReflectAccess = SharedSecrets.getJavaLangReflectAccess();
     }
 
-    /**
-     * A convenience class for acquiring the capability to instantiate
-     * reflective objects.  Use this instead of a raw call to {@link
-     * #getReflectionFactory} in order to avoid being limited by the
-     * permissions of your callers.
-     *
-     * <p>An instance of this class can be used as the argument of
-     * <code>AccessController.doPrivileged</code>.
-     */
-    public static final class GetReflectionFactoryAction
-        implements PrivilegedAction<ReflectionFactory> {
-        public ReflectionFactory run() {
-            return getReflectionFactory();
-        }
-    }
-
     /**
      * Provides the caller with the capability to instantiate reflective
      * objects.
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index c3bcbed4e3b..3c293770003 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -81,7 +81,6 @@
     exports java.lang.annotation;
     exports java.lang.classfile;
     exports java.lang.classfile.attribute;
-    exports java.lang.classfile.components;
     exports java.lang.classfile.constantpool;
     exports java.lang.classfile.instruction;
     exports java.lang.constant;
@@ -177,6 +176,8 @@
         jdk.net,
         jdk.sctp,
         jdk.crypto.cryptoki;
+    exports jdk.internal.classfile.components to
+        jdk.jfr;
     exports jdk.internal.foreign to
         jdk.incubator.vector;
     exports jdk.internal.event to
@@ -315,7 +316,6 @@
     exports sun.reflect.misc to
         java.desktop,
         java.management,
-        java.rmi,
         java.sql.rowset;
     exports sun.security.internal.interfaces to
         jdk.crypto.cryptoki;
@@ -328,7 +328,6 @@
     exports sun.security.pkcs to
         jdk.jartool;
     exports sun.security.provider to
-        java.rmi,
         java.security.jgss,
         jdk.crypto.cryptoki,
         jdk.security.auth;
@@ -343,7 +342,6 @@
         jdk.jartool;
     exports sun.security.util to
         java.naming,
-        java.rmi,
         java.security.jgss,
         java.security.sasl,
         java.smartcardio,
diff --git a/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java b/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java
index 4ec81e42c37..de7aa016ea3 100644
--- a/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java
+++ b/src/java.base/share/classes/sun/net/www/http/KeepAliveStream.java
@@ -154,7 +154,6 @@ public boolean hurry() {
         }
     }
 
-    @SuppressWarnings("removal")
     private static void queueForCleanup(KeepAliveCleanerEntry kace) {
         queue.lock();
         try {
diff --git a/src/java.base/share/classes/sun/security/provider/ML_DSA.java b/src/java.base/share/classes/sun/security/provider/ML_DSA.java
index 33ce8d5f52d..f3b72f53a32 100644
--- a/src/java.base/share/classes/sun/security/provider/ML_DSA.java
+++ b/src/java.base/share/classes/sun/security/provider/ML_DSA.java
@@ -25,7 +25,6 @@
 
 package sun.security.provider;
 
-import jdk.internal.vm.annotation.IntrinsicCandidate;
 import sun.security.provider.SHA3.SHAKE128;
 import sun.security.provider.SHA3.SHAKE256;
 
@@ -527,13 +526,13 @@ public int[][] t1Unpack(byte[] v) {
                 int tOffset = j*4;
                 int vOffset = (i*320) + (j*5);
                 t1[i][tOffset] = (v[vOffset] & 0xFF) +
-                    ((v[vOffset+1] << 8) & 0x3FF);
+                        ((v[vOffset+1] << 8) & 0x3FF);
                 t1[i][tOffset+1] = ((v[vOffset+1] >> 2) & 0x3F) +
-                    ((v[vOffset+2] << 6) & 0x3FF);
+                        ((v[vOffset+2] << 6) & 0x3FF);
                 t1[i][tOffset+2] = ((v[vOffset+2] >> 4) & 0xF) +
-                    ((v[vOffset+3] << 4) & 0x3FF);
+                        ((v[vOffset+3] << 4) & 0x3FF);
                 t1[i][tOffset+3] = ((v[vOffset+3] >> 6) & 0x3) +
-                    ((v[vOffset+4] << 2) & 0x3FF);
+                        ((v[vOffset+4] << 2) & 0x3FF);
             }
         }
         return t1;
@@ -875,8 +874,8 @@ int[][][] generateA(byte[] seed) {
                         rawOfs = 0;
                     }
                     tmp = (rawAij[rawOfs] & 0xFF) +
-                        ((rawAij[rawOfs + 1] & 0xFF) << 8) +
-                        ((rawAij[rawOfs + 2] & 0x7F) << 16);
+                            ((rawAij[rawOfs + 1] & 0xFF) << 8) +
+                            ((rawAij[rawOfs + 2] & 0x7F) << 16);
                     rawOfs += 3;
                     if (tmp < ML_DSA_Q) {
                         aij[ofs] = tmp;
@@ -981,7 +980,7 @@ private void decompose(int[][] input, int[][] lowPart, int[][] highPart) {
         int multiplier = (gamma2 == 95232 ? 22 : 8);
         for (int i = 0; i < mlDsa_k; i++) {
             ML_DSA.mlDsaDecomposePoly(input[i], lowPart[i],
-                highPart[i], gamma2 * 2, multiplier);
+                    highPart[i], gamma2 * 2, multiplier);
         }
     }
 
@@ -1032,12 +1031,6 @@ private int[][] useHint(boolean[][] h, int[][] r) {
     */
 
     public static int[] mlDsaNtt(int[] coeffs) {
-        implMlDsaAlmostNttJava(coeffs);
-        implMlDsaMontMulByConstantJava(coeffs,  MONT_R_MOD_Q);
-        return coeffs;
-    }
-
-    static void implMlDsaAlmostNttJava(int[] coeffs) {
         int dimension = ML_DSA_N;
         int m = 0;
         for (int l = dimension / 2; l > 0; l /= 2) {
@@ -1050,15 +1043,11 @@ static void implMlDsaAlmostNttJava(int[] coeffs) {
                 m++;
             }
         }
-    }
-
-    public static int[] mlDsaInverseNtt(int[] coeffs) {
-        implMlDsaAlmostInverseNttJava(coeffs);
-        implMlDsaMontMulByConstantJava(coeffs, MONT_DIM_INVERSE);
+        montMulByConstant(coeffs,  MONT_R_MOD_Q);
         return coeffs;
     }
 
-    static void implMlDsaAlmostInverseNttJava(int[] coeffs) {
+    public static int[] mlDsaInverseNtt(int[] coeffs) {
         int dimension = ML_DSA_N;
         int m = 0;
         for (int l = 1; l < dimension; l *= 2) {
@@ -1067,11 +1056,13 @@ static void implMlDsaAlmostInverseNttJava(int[] coeffs) {
                     int tmp = coeffs[j];
                     coeffs[j] = (tmp + coeffs[j + l]);
                     coeffs[j + l] = montMul(tmp - coeffs[j + l],
-                        MONT_ZETAS_FOR_INVERSE_NTT[m]);
+                            MONT_ZETAS_FOR_INVERSE_NTT[m]);
                 }
                 m++;
             }
         }
+        montMulByConstant(coeffs, MONT_DIM_INVERSE);
+        return coeffs;
     }
 
     void mlDsaVectorNtt(int[][] vector) {
@@ -1086,22 +1077,13 @@ void mlDsaVectorInverseNtt(int[][] vector) {
         }
     }
 
-    //Todo
-    public static void mlDsaNttMultiply(int[] res, int[] coeffs1, int[] coeffs2) {
-        implMlDsaNttMultJava(res, coeffs1, coeffs2);
-    }
-
-    static void implMlDsaNttMultJava(int[] product, int[] coeffs1, int[] coeffs2) {
+    public static void mlDsaNttMultiply(int[] product, int[] coeffs1, int[] coeffs2) {
         for (int i = 0; i < ML_DSA_N; i++) {
             product[i] = montMul(coeffs1[i], toMont(coeffs2[i]));
         }
     }
 
     public static void montMulByConstant(int[] coeffs, int constant) {
-        implMlDsaMontMulByConstantJava(coeffs, constant);
-    }
-
-    static void implMlDsaMontMulByConstantJava(int[] coeffs, int constant) {
         for (int i = 0; i < ML_DSA_N; i++) {
             coeffs[i] = montMul((coeffs[i]), constant);
         }
@@ -1109,17 +1091,6 @@ static void implMlDsaMontMulByConstantJava(int[] coeffs, int constant) {
 
     public static void mlDsaDecomposePoly(int[] input, int[] lowPart, int[] highPart,
                                          int twoGamma2, int multiplier) {
-        implMlDsaDecomposePoly(input, lowPart, highPart, twoGamma2, multiplier);
-    }
-
-    @IntrinsicCandidate
-    static void implMlDsaDecomposePoly(int[] input, int[] lowPart, int[] highPart,
-                                          int twoGamma2, int multiplier) {
-        decomposePolyJava(input, lowPart, highPart, twoGamma2, multiplier);
-    }
-
-    static void decomposePolyJava(int[] input, int[] lowPart, int[] highPart,
-                                 int twoGamma2, int multiplier) {
         for (int m = 0; m < ML_DSA_N; m++) {
             int rplus = input[m];
             rplus = rplus - ((rplus + 5373807) >> 23) * ML_DSA_Q;
diff --git a/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java b/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
index 3213b1e5a5e..dffe7c5cdb1 100644
--- a/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
+++ b/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
@@ -41,7 +41,7 @@ public enum Version {
     // set the version to an older one. The following VM option is required:
     //
     // --add-exports java.base/sun.security.provider=ALL-UNNAMED
-    public static Version version = Version.DRAFT;
+    public static Version version = Version.FINAL;
 
     static int name2int(String name) {
         if (name.endsWith("44")) {
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
index 15ae425850e..e3f65f82f0c 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
@@ -25,6 +25,8 @@
 
 package sun.nio.ch;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.nio.channels.*;
 import java.util.concurrent.*;
 import java.nio.ByteBuffer;
@@ -34,6 +36,7 @@
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.access.JavaIOFileDescriptorAccess;
 import jdk.internal.event.FileForceEvent;
+import jdk.internal.invoke.MhUtil;
 
 /**
  * Windows implementation of AsynchronousFileChannel using overlapped I/O.
@@ -383,10 +386,13 @@ protected void implRelease(FileLockImpl fli) throws IOException {
      * Task that initiates read operation and handles completion result.
      */
     private class ReadTask<A> implements Runnable, Iocp.ResultHandler {
+        private static final VarHandle RELEASED = MhUtil.findVarHandle(MethodHandles.lookup(),
+                "released", boolean.class);
         private final ByteBuffer dst;
         private final int pos, rem;     // buffer position/remaining
         private final long position;    // file position
         private final PendingFuture<Integer,A> result;
+        private volatile boolean released;
 
         // set to dst if direct; otherwise set to substituted direct buffer
         private volatile ByteBuffer buf;
@@ -405,8 +411,9 @@ private class ReadTask<A> implements Runnable, Iocp.ResultHandler {
         }
 
         void releaseBufferIfSubstituted() {
-            if (buf != dst)
+            if (buf != dst && RELEASED.compareAndSet(this, false, true)) {
                 Util.releaseTemporaryDirectBuffer(buf);
+            }
         }
 
         void updatePosition(int bytesTransferred) {
@@ -569,10 +576,13 @@ <A> Future<Integer> implRead(ByteBuffer dst,
      * Task that initiates write operation and handles completion result.
      */
     private class WriteTask<A> implements Runnable, Iocp.ResultHandler {
+        private static final VarHandle RELEASED = MhUtil.findVarHandle(MethodHandles.lookup(),
+                "released", boolean.class);
         private final ByteBuffer src;
         private final int pos, rem;     // buffer position/remaining
         private final long position;    // file position
         private final PendingFuture<Integer,A> result;
+        private volatile boolean released;
 
         // set to src if direct; otherwise set to substituted direct buffer
         private volatile ByteBuffer buf;
@@ -591,8 +601,9 @@ private class WriteTask<A> implements Runnable, Iocp.ResultHandler {
         }
 
         void releaseBufferIfSubstituted() {
-            if (buf != src)
+            if (buf != src && RELEASED.compareAndSet(this, false, true)) {
                 Util.releaseTemporaryDirectBuffer(buf);
+            }
         }
 
         void updatePosition(int bytesTransferred) {
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
index 9f3916bad8c..f8b5fab4316 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
@@ -25,12 +25,15 @@
 
 package sun.nio.ch;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.nio.channels.*;
 import java.nio.ByteBuffer;
 import java.nio.BufferOverflowException;
 import java.net.*;
 import java.util.concurrent.*;
 import java.io.IOException;
+import jdk.internal.invoke.MhUtil;
 import jdk.internal.misc.Unsafe;
 import sun.net.util.SocketExceptions;
 
@@ -367,10 +370,13 @@ <A> Future<Void> implConnect(SocketAddress remote,
      * result when the read completes.
      */
     private class ReadTask<V,A> implements Runnable, Iocp.ResultHandler {
+        private static final VarHandle RELEASED = MhUtil.findVarHandle(MethodHandles.lookup(),
+                "released", boolean.class);
         private final ByteBuffer[] bufs;
         private final int numBufs;
         private final boolean scatteringRead;
         private final PendingFuture<V,A> result;
+        private volatile boolean released;
 
         // set by run method
         private ByteBuffer[] shadow;
@@ -461,12 +467,14 @@ void updateBuffers(int bytesRead) {
         }
 
         void releaseBuffers() {
-            for (int i=0; i<numBufs; i++) {
-                if (!(bufs[i] instanceof DirectBuffer)) {
-                    Util.releaseTemporaryDirectBuffer(shadow[i]);
+            if (RELEASED.compareAndSet(this, false, true)) {
+                for (int i = 0; i < numBufs; i++) {
+                    if (!(bufs[i] instanceof DirectBuffer)) {
+                        Util.releaseTemporaryDirectBuffer(shadow[i]);
+                    }
                 }
+                IOUtil.releaseScopes(scopeHandleReleasers);
             }
-            IOUtil.releaseScopes(scopeHandleReleasers);
         }
 
         @Override
@@ -641,10 +649,13 @@ public void run() {
      * result when the write completes.
      */
     private class WriteTask<V,A> implements Runnable, Iocp.ResultHandler {
+        private static final VarHandle RELEASED = MhUtil.findVarHandle(MethodHandles.lookup(),
+                "released", boolean.class);
         private final ByteBuffer[] bufs;
         private final int numBufs;
         private final boolean gatheringWrite;
         private final PendingFuture<V,A> result;
+        private volatile boolean released;
 
         // set by run method
         private ByteBuffer[] shadow;
@@ -728,12 +739,14 @@ void updateBuffers(int bytesWritten) {
         }
 
         void releaseBuffers() {
-            for (int i=0; i<numBufs; i++) {
-                if (!(bufs[i] instanceof DirectBuffer)) {
-                    Util.releaseTemporaryDirectBuffer(shadow[i]);
+            if (RELEASED.compareAndSet(this, false, true)) {
+                for (int i = 0; i < numBufs; i++) {
+                    if (!(bufs[i] instanceof DirectBuffer)) {
+                        Util.releaseTemporaryDirectBuffer(shadow[i]);
+                    }
                 }
+                IOUtil.releaseScopes(scopeHandleReleasers);
             }
-            IOUtil.releaseScopes(scopeHandleReleasers);
         }
 
         @Override
diff --git a/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.svg b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.svg
index 09a74210d41..8bb51a43055 100644
--- a/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.svg
+++ b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-insert.svg
@@ -97,49 +97,49 @@
 
     <g id="the">
         <rect x="3.5" y="119.5" width="20" height="20"/>
-        <text x="13" y="129">T</text>
+        <text x="13.5" y="129.5">T</text>
         <rect x="27.5" y="119.5" width="20" height="20"/>
-        <text x="37" y="129">h</text>
+        <text x="37.5" y="129.5">h</text>
         <rect x="51.5" y="119.5" width="20" height="20"/>
-        <text x="61" y="129">e</text>
+        <text x="61.5" y="129.5">e</text>
         <rect x="75.5" y="119.5" width="20" height="20"/>
-        <text x="85" y="129"> </text>
+        <text x="85.5" y="129.5"> </text>
     </g>
 
     <g id="quick">
         <rect x="99.5" y="119.5" width="20" height="20"/>
-        <text x="109" y="129">q</text>
+        <text x="109.5" y="129.5">q</text>
         <rect x="123.5" y="119.5" width="20" height="20"/>
-        <text x="133" y="129">u</text>
+        <text x="133.5" y="129.5">u</text>
         <rect x="147.5" y="119.5" width="20" height="20"/>
-        <text x="157" y="129">i</text>
+        <text x="157.5" y="129.5">i</text>
         <rect x="171.5" y="119.5" width="20" height="20"/>
-        <text x="181" y="129">c</text>
+        <text x="181.5" y="129.5">c</text>
         <rect x="195.5" y="119.5" width="20" height="20"/>
-        <text x="205" y="129">k</text>
+        <text x="205.5" y="129.5">k</text>
         <rect x="219.5" y="119.5" width="20" height="20"/>
-        <text x="229" y="129"> </text>
+        <text x="229.5" y="129.5"> </text>
     </g>
 
     <g id="brownFox">
         <rect x="243.5" y="119.5" width="20" height="20"/>
-        <text x="253" y="129">b</text>
+        <text x="253.5" y="129.5">b</text>
         <rect x="267.5" y="119.5" width="20" height="20"/>
-        <text x="277" y="129">r</text>
+        <text x="277.5" y="129.5">r</text>
         <rect x="291.5" y="119.5" width="20" height="20"/>
-        <text x="301" y="129">o</text>
+        <text x="301.5" y="129.5">o</text>
         <rect x="315.5" y="119.5" width="20" height="20"/>
-        <text x="325" y="129">w</text>
+        <text x="325.5" y="129.5">w</text>
         <rect x="339.5" y="119.5" width="20" height="20"/>
-        <text x="349" y="129">n</text>
+        <text x="349.5" y="129.5">n</text>
         <rect x="363.5" y="119.5" width="20" height="20"/>
-        <text x="373" y="129"> </text>
+        <text x="373.5" y="129.5"> </text>
         <rect x="387.5" y="119.5" width="20" height="20"/>
-        <text x="397" y="129">f</text>
+        <text x="397.5" y="129.5">f</text>
         <rect x="411.5" y="119.5" width="20" height="20"/>
-        <text x="421" y="129">o</text>
+        <text x="421.5" y="129.5">o</text>
         <rect x="435.5" y="119.5" width="20" height="20"/>
-        <text x="445" y="129">x</text>
+        <text x="445.5" y="129.5">x</text>
     </g>
 
     <path d="M  97.5,71 L 241.5,114" marker-end="url(#arrow)"/>
diff --git a/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.svg b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.svg
index 2c8e91923f5..e47a5f750d0 100644
--- a/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.svg
+++ b/src/java.desktop/share/classes/javax/swing/text/doc-files/Document-remove.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- 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
@@ -81,49 +81,49 @@
 
     <g id="the">
         <rect x="3.5" y="25.5" width="20" height="20"/>
-        <text x="13" y="35">T</text>
+        <text x="13.5" y="35.5">T</text>
         <rect x="27.5" y="25.5" width="20" height="20"/>
-        <text x="37" y="35">h</text>
+        <text x="37.5" y="35.5">h</text>
         <rect x="51.5" y="25.5" width="20" height="20"/>
-        <text x="61" y="35">e</text>
+        <text x="61.5" y="35.5">e</text>
         <rect x="75.5" y="25.5" width="20" height="20"/>
-        <text x="85" y="35"> </text>
+        <text x="85.5" y="35.5"> </text>
     </g>
 
     <g id="quick">
         <rect x="99.5" y="25.5" width="20" height="20"/>
-        <text x="109" y="35">q</text>
+        <text x="109.5" y="35.5">q</text>
         <rect x="123.5" y="25.5" width="20" height="20"/>
-        <text x="133" y="35">u</text>
+        <text x="133.5" y="35.5">u</text>
         <rect x="147.5" y="25.5" width="20" height="20"/>
-        <text x="157" y="35">i</text>
+        <text x="157.5" y="35.5">i</text>
         <rect x="171.5" y="25.5" width="20" height="20"/>
-        <text x="181" y="35">c</text>
+        <text x="181.5" y="35.5">c</text>
         <rect x="195.5" y="25.5" width="20" height="20"/>
-        <text x="205" y="35">k</text>
+        <text x="205.5" y="35.5">k</text>
         <rect x="219.5" y="25.5" width="20" height="20"/>
-        <text x="229" y="35"> </text>
+        <text x="229.5" y="35.5"> </text>
     </g>
 
     <g id="brownFox">
         <rect x="243.5" y="25.5" width="20" height="20"/>
-        <text x="253" y="35">b</text>
+        <text x="253.5" y="35.5">b</text>
         <rect x="267.5" y="25.5" width="20" height="20"/>
-        <text x="277" y="35">r</text>
+        <text x="277.5" y="35.5">r</text>
         <rect x="291.5" y="25.5" width="20" height="20"/>
-        <text x="301" y="35">o</text>
+        <text x="301.5" y="35.5">o</text>
         <rect x="315.5" y="25.5" width="20" height="20"/>
-        <text x="325" y="35">w</text>
+        <text x="325.5" y="35.5">w</text>
         <rect x="339.5" y="25.5" width="20" height="20"/>
-        <text x="349" y="35">n</text>
+        <text x="349.5" y="35.5">n</text>
         <rect x="363.5" y="25.5" width="20" height="20"/>
-        <text x="373" y="35"> </text>
+        <text x="373.5" y="35.5"> </text>
         <rect x="387.5" y="25.5" width="20" height="20"/>
-        <text x="397" y="35">f</text>
+        <text x="397.5" y="35.5">f</text>
         <rect x="411.5" y="25.5" width="20" height="20"/>
-        <text x="421" y="35">o</text>
+        <text x="421.5" y="35.5">o</text>
         <rect x="435.5" y="25.5" width="20" height="20"/>
-        <text x="445" y="35">x</text>
+        <text x="445.5" y="35.5">x</text>
     </g>
 
     <line x1="97.5" y1="22" x2="97.5" y2="55"/>
diff --git a/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java b/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
index e5aa863f9a6..555dfdc918b 100644
--- a/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
+++ b/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,10 +39,6 @@
 import com.sun.jmx.remote.util.EnvHelp;
 
 import java.lang.ref.WeakReference;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -64,13 +60,11 @@
 import javax.management.ListenerNotFoundException;
 import javax.management.MBeanException;
 import javax.management.MBeanInfo;
-import javax.management.MBeanPermission;
 import javax.management.MBeanRegistration;
 import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerDelegate;
 import javax.management.MBeanServerNotification;
-import javax.management.MBeanTrustPermission;
 import javax.management.NotCompliantMBeanException;
 import javax.management.Notification;
 import javax.management.NotificationBroadcaster;
@@ -248,9 +242,6 @@ private ObjectInstance createMBean(String className, ObjectName name,
             name = nonDefaultDomain(name);
         }
 
-        checkMBeanPermission(className, null, null, "instantiate");
-        checkMBeanPermission(className, null, name, "registerMBean");
-
         /* Load the appropriate class. */
         if (withDefaultLoaderRepository) {
             if (MBEANSERVER_LOGGER.isLoggable(Level.TRACE)) {
@@ -281,8 +272,6 @@ private ObjectInstance createMBean(String className, ObjectName name,
             theClass = instantiator.findClass(className, loaderName);
         }
 
-        checkMBeanTrustPermission(theClass);
-
         // Check that the MBean can be instantiated by the MBeanServer.
         Introspector.testCreation(theClass);
 
@@ -309,9 +298,6 @@ public ObjectInstance registerMBean(Object object, ObjectName name)
 
         final String infoClassName = getNewMBeanClassName(object);
 
-        checkMBeanPermission(infoClassName, null, name, "registerMBean");
-        checkMBeanTrustPermission(theClass);
-
         return registerObject(infoClassName, object, name);
     }
 
@@ -417,8 +403,6 @@ private void exclusiveUnregisterMBean(ObjectName name)
         DynamicMBean instance = getMBean(name);
         // may throw InstanceNotFoundException
 
-        checkMBeanPermission(instance, null, name, "unregisterMBean");
-
         if (instance instanceof MBeanRegistration)
             preDeregisterInvoke((MBeanRegistration) instance);
 
@@ -451,47 +435,13 @@ public ObjectInstance getObjectInstance(ObjectName name)
         name = nonDefaultDomain(name);
         DynamicMBean instance = getMBean(name);
 
-        checkMBeanPermission(instance, null, name, "getObjectInstance");
-
         final String className = getClassName(instance);
 
         return new ObjectInstance(name, className);
     }
 
     public Set<ObjectInstance> queryMBeans(ObjectName name, QueryExp query) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            // Check if the caller has the right to invoke 'queryMBeans'
-            //
-            checkMBeanPermission((String) null, null, null, "queryMBeans");
-
-            // Perform query without "query".
-            //
-            Set<ObjectInstance> list = queryMBeansImpl(name, null);
-
-            // Check if the caller has the right to invoke 'queryMBeans'
-            // on each specific classname/objectname in the list.
-            //
-            Set<ObjectInstance> allowedList = new HashSet<>(list.size());
-            for (ObjectInstance oi : list) {
-                try {
-                    checkMBeanPermission(oi.getClassName(), null,
-                                         oi.getObjectName(), "queryMBeans");
-                    allowedList.add(oi);
-                } catch (SecurityException e) {
-                    // OK: Do not add this ObjectInstance to the list
-                }
-            }
-
-            // Apply query to allowed MBeans only.
-            //
-            return filterListOfObjectInstances(allowedList, query);
-        } else {
-            // Perform query.
-            //
-            return queryMBeansImpl(name, query);
-        }
+        return queryMBeansImpl(name, query);
     }
 
     private Set<ObjectInstance> queryMBeansImpl(ObjectName name,
@@ -504,46 +454,7 @@ private Set<ObjectInstance> queryMBeansImpl(ObjectName name,
     }
 
     public Set<ObjectName> queryNames(ObjectName name, QueryExp query) {
-        Set<ObjectName> queryList;
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            // Check if the caller has the right to invoke 'queryNames'
-            //
-            checkMBeanPermission((String) null, null, null, "queryNames");
-
-            // Perform query without "query".
-            //
-            Set<ObjectInstance> list = queryMBeansImpl(name, null);
-
-            // Check if the caller has the right to invoke 'queryNames'
-            // on each specific classname/objectname in the list.
-            //
-            Set<ObjectInstance> allowedList = new HashSet<>(list.size());
-            for (ObjectInstance oi : list) {
-                try {
-                    checkMBeanPermission(oi.getClassName(), null,
-                                         oi.getObjectName(), "queryNames");
-                    allowedList.add(oi);
-                } catch (SecurityException e) {
-                    // OK: Do not add this ObjectInstance to the list
-                }
-            }
-
-            // Apply query to allowed MBeans only.
-            //
-            Set<ObjectInstance> queryObjectInstanceList =
-                filterListOfObjectInstances(allowedList, query);
-            queryList = new HashSet<>(queryObjectInstanceList.size());
-            for (ObjectInstance oi : queryObjectInstanceList) {
-                queryList.add(oi.getObjectName());
-            }
-        } else {
-            // Perform query.
-            //
-            queryList = queryNamesImpl(name, query);
-        }
-        return queryList;
+        return queryNamesImpl(name, query);
     }
 
     private Set<ObjectName> queryNamesImpl(ObjectName name, QueryExp query) {
@@ -562,45 +473,11 @@ public boolean isRegistered(ObjectName name) {
         }
 
         name = nonDefaultDomain(name);
-
-        /* No Permission check */
-        // isRegistered is always unchecked as per JMX spec.
-
         return (repository.contains(name));
     }
 
     public String[] getDomains()  {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            // Check if the caller has the right to invoke 'getDomains'
-            //
-            checkMBeanPermission((String) null, null, null, "getDomains");
-
-            // Return domains
-            //
-            String[] domains = repository.getDomains();
-
-            // Check if the caller has the right to invoke 'getDomains'
-            // on each specific domain in the list.
-            //
-            List<String> result = new ArrayList<>(domains.length);
-            for (int i = 0; i < domains.length; i++) {
-                try {
-                    ObjectName dom = Util.newObjectName(domains[i] + ":x=x");
-                    checkMBeanPermission((String) null, null, dom, "getDomains");
-                    result.add(domains[i]);
-                } catch (SecurityException e) {
-                    // OK: Do not add this domain to the list
-                }
-            }
-
-            // Make an array from result.
-            //
-            return result.toArray(new String[result.size()]);
-        } else {
-            return repository.getDomains();
-        }
+        return repository.getDomains();
     }
 
     public Integer getMBeanCount() {
@@ -630,7 +507,6 @@ public Object getAttribute(ObjectName name, String attribute)
         }
 
         final DynamicMBean instance = getMBean(name);
-        checkMBeanPermission(instance, attribute, name, "getAttribute");
 
         try {
             return instance.getAttribute(attribute);
@@ -664,33 +540,7 @@ public AttributeList getAttributes(ObjectName name, String[] attributes)
         }
 
         final DynamicMBean instance = getMBean(name);
-        final String[] allowedAttributes;
-        @SuppressWarnings("removal")
-        final SecurityManager sm = System.getSecurityManager();
-        if (sm == null)
-            allowedAttributes = attributes;
-        else {
-            final String classname = getClassName(instance);
-
-            // Check if the caller has the right to invoke 'getAttribute'
-            //
-            checkMBeanPermission(classname, null, name, "getAttribute");
-
-            // Check if the caller has the right to invoke 'getAttribute'
-            // on each specific attribute
-            //
-            List<String> allowedList = new ArrayList<>(attributes.length);
-            for (String attr : attributes) {
-                try {
-                    checkMBeanPermission(classname, attr, name, "getAttribute");
-                    allowedList.add(attr);
-                } catch (SecurityException e) {
-                    // OK: Do not add this attribute to the list
-                }
-            }
-            allowedAttributes =
-                    allowedList.toArray(new String[allowedList.size()]);
-        }
+        final String[] allowedAttributes = attributes;
 
         try {
             return instance.getAttributes(allowedAttributes);
@@ -725,7 +575,6 @@ public void setAttribute(ObjectName name, Attribute attribute)
         }
 
         DynamicMBean instance = getMBean(name);
-        checkMBeanPermission(instance, attribute.getName(), name, "setAttribute");
 
         try {
             instance.setAttribute(attribute);
@@ -756,32 +605,8 @@ public AttributeList setAttributes(ObjectName name,
         name = nonDefaultDomain(name);
 
         final DynamicMBean instance = getMBean(name);
-        final AttributeList allowedAttributes;
-        @SuppressWarnings("removal")
-        final SecurityManager sm = System.getSecurityManager();
-        if (sm == null)
-            allowedAttributes = attributes;
-        else {
-            String classname = getClassName(instance);
-
-            // Check if the caller has the right to invoke 'setAttribute'
-            //
-            checkMBeanPermission(classname, null, name, "setAttribute");
+        final AttributeList allowedAttributes = attributes;
 
-            // Check if the caller has the right to invoke 'setAttribute'
-            // on each specific attribute
-            //
-            allowedAttributes = new AttributeList(attributes.size());
-            for (Attribute attribute : attributes.asList()) {
-                try {
-                    checkMBeanPermission(classname, attribute.getName(),
-                                         name, "setAttribute");
-                    allowedAttributes.add(attribute);
-                } catch (SecurityException e) {
-                    // OK: Do not add this attribute to the list
-                }
-            }
-        }
         try {
             return instance.setAttributes(allowedAttributes);
         } catch (Throwable t) {
@@ -798,7 +623,6 @@ public Object invoke(ObjectName name, String operationName,
         name = nonDefaultDomain(name);
 
         DynamicMBean instance = getMBean(name);
-        checkMBeanPermission(instance, operationName, name, "invoke");
         try {
             return instance.invoke(operationName, params, signature);
         } catch (Throwable t) {
@@ -922,8 +746,6 @@ private ObjectInstance registerDynamicMBean(String classname,
                         ObjectName.getInstance(nonDefaultDomain(logicalName));
             }
 
-            checkMBeanPermission(classname, null, logicalName, "registerMBean");
-
             if (logicalName == null) {
                 final RuntimeException wrapped =
                     new IllegalArgumentException("No object name specified");
@@ -1159,7 +981,6 @@ public void addNotificationListener(ObjectName name,
         }
 
         DynamicMBean instance = getMBean(name);
-        checkMBeanPermission(instance, null, name, "addNotificationListener");
 
         NotificationBroadcaster broadcaster =
                 getNotificationBroadcaster(name, instance,
@@ -1288,7 +1109,6 @@ private void removeNotificationListener(ObjectName name,
         }
 
         DynamicMBean instance = getMBean(name);
-        checkMBeanPermission(instance, null, name, "removeNotificationListener");
 
         /* We could simplify the code by assigning broadcaster after
            assigning listenerWrapper, but that would change the error
@@ -1356,8 +1176,6 @@ public MBeanInfo getMBeanInfo(ObjectName name)
             throw new JMRuntimeException("MBean " + name +
                                          "has no MBeanInfo");
 
-        checkMBeanPermission(mbi.getClassName(), null, name, "getMBeanInfo");
-
         return mbi;
     }
 
@@ -1365,7 +1183,6 @@ public boolean isInstanceOf(ObjectName name, String className)
         throws InstanceNotFoundException {
 
         final DynamicMBean instance = getMBean(name);
-        checkMBeanPermission(instance, null, name, "isInstanceOf");
 
         try {
             Object resource = getResource(instance);
@@ -1407,7 +1224,6 @@ public ClassLoader getClassLoaderFor(ObjectName mbeanName)
         throws InstanceNotFoundException {
 
         DynamicMBean instance = getMBean(mbeanName);
-        checkMBeanPermission(instance, null, mbeanName, "getClassLoaderFor");
         return getResource(instance).getClass().getClassLoader();
     }
 
@@ -1422,12 +1238,10 @@ public ClassLoader getClassLoader(ObjectName loaderName)
             throws InstanceNotFoundException {
 
         if (loaderName == null) {
-            checkMBeanPermission((String) null, null, null, "getClassLoader");
             return server.getClass().getClassLoader();
         }
 
         DynamicMBean instance = getMBean(loaderName);
-        checkMBeanPermission(instance, null, loaderName, "getClassLoader");
 
         Object resource = getResource(instance);
 
@@ -1565,48 +1379,6 @@ private static String safeGetClassName(DynamicMBean mbean) {
         }
     }
 
-    /**
-     * Applies the specified queries to the set of ObjectInstances.
-     */
-    private Set<ObjectInstance>
-            filterListOfObjectInstances(Set<ObjectInstance> list,
-                                        QueryExp query) {
-        // Null query.
-        //
-        if (query == null) {
-            return list;
-        } else {
-            Set<ObjectInstance> result = new HashSet<>();
-            // Access the filter.
-            //
-            for (ObjectInstance oi : list) {
-                boolean res = false;
-                MBeanServer oldServer = QueryEval.getMBeanServer();
-                query.setMBeanServer(server);
-                try {
-                    res = query.apply(oi.getObjectName());
-                } catch (Exception e) {
-                    res = false;
-                } finally {
-                    /*
-                     * query.setMBeanServer is probably
-                     * QueryEval.setMBeanServer so put back the old
-                     * value.  Since that method uses a ThreadLocal
-                     * variable, this code is only needed for the
-                     * unusual case where the user creates a custom
-                     * QueryExp that calls a nested query on another
-                     * MBeanServer.
-                     */
-                    query.setMBeanServer(oldServer);
-                }
-                if (res) {
-                    result.add(oi);
-                }
-            }
-            return result;
-        }
-    }
-
     /*
      * Get the existing wrapper for this listener, name, and mbean, if
      * there is one.  Otherwise, if "create" is true, create and
@@ -1749,56 +1521,6 @@ private static String getClassName(DynamicMBean mbean) {
             return mbean.getMBeanInfo().getClassName();
     }
 
-    private static void checkMBeanPermission(DynamicMBean mbean,
-                                             String member,
-                                             ObjectName objectName,
-                                             String actions) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            checkMBeanPermission(safeGetClassName(mbean),
-                                 member,
-                                 objectName,
-                                 actions);
-        }
-    }
-
-    private static void checkMBeanPermission(String classname,
-                                             String member,
-                                             ObjectName objectName,
-                                             String actions) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Permission perm = new MBeanPermission(classname,
-                                                  member,
-                                                  objectName,
-                                                  actions);
-            sm.checkPermission(perm);
-        }
-    }
-
-    private static void checkMBeanTrustPermission(final Class<?> theClass)
-        throws SecurityException {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Permission perm = new MBeanTrustPermission("register");
-            PrivilegedAction<ProtectionDomain> act =
-                new PrivilegedAction<>() {
-                    public ProtectionDomain run() {
-                        return theClass.getProtectionDomain();
-                    }
-                };
-            @SuppressWarnings("removal")
-            ProtectionDomain pd = AccessController.doPrivileged(act);
-            @SuppressWarnings("removal")
-            AccessControlContext acc =
-                new AccessControlContext(new ProtectionDomain[] { pd });
-            sm.checkPermission(perm, acc);
-        }
-    }
-
     // ------------------------------------------------------------------
     //
     // Dealing with registration of special MBeans in the repository.
@@ -2006,13 +1728,7 @@ private ResourceContext makeResourceContextFor(Object resource,
         return ResourceContext.NONE;
     }
 
-    @SuppressWarnings("removal")
     private ModifiableClassLoaderRepository getInstantiatorCLR() {
-        return AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public ModifiableClassLoaderRepository run() {
-                return instantiator != null ? instantiator.getClassLoaderRepository() : null;
-            }
-        });
+        return instantiator != null ? instantiator.getClassLoaderRepository() : null;
     }
 }
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
index a73e46e6020..78dc5ce2ea1 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
@@ -27,18 +27,15 @@
 
 
 import static com.sun.jmx.defaults.JmxProperties.MBEANSERVER_LOGGER;
-import java.security.Permission;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.lang.System.Logger.Level;
-import javax.management.MBeanPermission;
 
 import javax.management.ObjectName;
 import javax.management.loading.PrivateClassLoader;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * This class keeps the list of Class Loaders registered in the MBean Server.
@@ -192,7 +189,6 @@ private Class<?> loadClass(final LoaderEntry list[],
                                final ClassLoader without,
                                final ClassLoader stop)
             throws ClassNotFoundException {
-        ReflectUtil.checkPackageAccess(className);
         final int size = list.length;
         for(int i=0; i<size; i++) {
             try {
@@ -280,20 +276,7 @@ public final synchronized void removeClassLoader(ObjectName name) {
     }
 
     public final ClassLoader getClassLoader(ObjectName name) {
-        ClassLoader instance = loadersWithNames.get(name);
-        if (instance != null) {
-            @SuppressWarnings("removal")
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                Permission perm =
-                        new MBeanPermission(instance.getClass().getName(),
-                        null,
-                        name,
-                        "getClassLoader");
-                sm.checkPermission(perm);
-            }
-        }
-        return instance;
+        return loadersWithNames.get(name);
     }
 
 }
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
index e0713f694db..fa2a4c9add3 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
@@ -74,7 +74,6 @@
 import javax.management.openmbean.TabularDataSupport;
 import javax.management.openmbean.TabularType;
 import sun.reflect.misc.MethodUtil;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  *   <p>A converter between Java types and the limited set of classes
@@ -301,7 +300,6 @@ recognizes the Type (Chain of Responsibility pattern).  */
 
     private static <T extends Enum<T>> MXBeanMapping
             makeEnumMapping(Class<?> enumClass, Class<T> fake) {
-        ReflectUtil.checkPackageAccess(enumClass);
         return new EnumMapping<>(Util.<Class<T>>cast(enumClass));
     }
 
@@ -426,7 +424,6 @@ private MXBeanMapping makeCompositeMapping(Class<?> c,
             (c.getName().equals("com.sun.management.GcInfo") &&
                 c.getClassLoader() == null);
 
-        ReflectUtil.checkPackageAccess(c);
         final List<Method> methods =
                 MBeanAnalyzer.eliminateCovariantMethods(Arrays.asList(c.getMethods()));
         final SortedMap<String,Method> getterMap = newSortedMap();
@@ -1119,7 +1116,6 @@ Object fromCompositeData(CompositeData cd,
             Object o;
             try {
                 final Class<?> targetClass = getTargetClass();
-                ReflectUtil.checkPackageAccess(targetClass);
                 @SuppressWarnings("deprecation")
                 Object tmp = targetClass.newInstance();
                 o = tmp;
@@ -1375,7 +1371,6 @@ Object fromCompositeData(CompositeData cd,
             }
 
             try {
-                ReflectUtil.checkPackageAccess(max.constructor.getDeclaringClass());
                 return max.constructor.newInstance(params);
             } catch (Exception e) {
                 final String msg =
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
index ea1d685b5fc..374dd57a4ee 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -52,12 +52,10 @@
 import com.sun.jmx.remote.util.EnvHelp;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
-import java.security.AccessController;
 import javax.management.AttributeNotFoundException;
 import javax.management.openmbean.CompositeData;
 
 import sun.reflect.misc.MethodUtil;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * This class contains the methods for performing all the tests needed to verify
@@ -66,12 +64,7 @@
  * @since 1.5
  */
 public class Introspector {
-    public static final boolean ALLOW_NONPUBLIC_MBEAN;
-    static {
-        @SuppressWarnings("removal")
-        String val = AccessController.doPrivileged(new GetPropertyAction("jdk.jmx.mbeans.allowNonPublic"));
-        ALLOW_NONPUBLIC_MBEAN = Boolean.parseBoolean(val);
-    }
+    public static final boolean ALLOW_NONPUBLIC_MBEAN = Boolean.parseBoolean(System.getProperty("jdk.jmx.mbeans.allowNonPublic"));
 
      /*
      * ------------------------------------------
@@ -276,7 +269,6 @@ public static void testComplianceMBeanInterface(Class<?> interfaceClass)
             throws NotCompliantMBeanException {
         if (mbeanInterface == null)
             mbeanInterface = getStandardMBeanInterface(baseClass);
-        ReflectUtil.checkPackageAccess(mbeanInterface);
         MBeanIntrospector<?> introspector = StandardMBeanIntrospector.getInstance();
         return getClassMBeanInfo(introspector, baseClass, mbeanInterface);
     }
@@ -401,18 +393,12 @@ public static Descriptor descriptorForAnnotations(Annotation[] annots) {
         for (Annotation a : annots) {
             Class<? extends Annotation> c = a.annotationType();
             Method[] elements = c.getMethods();
-            boolean packageAccess = false;
             for (Method element : elements) {
                 DescriptorKey key = element.getAnnotation(DescriptorKey.class);
                 if (key != null) {
                     String name = key.value();
                     Object value;
                     try {
-                        // Avoid checking access more than once per annotation
-                        if (!packageAccess) {
-                            ReflectUtil.checkPackageAccess(c);
-                            packageAccess = true;
-                        }
                         value = MethodUtil.invoke(element, a, null);
                     } catch (RuntimeException e) {
                         // we don't expect this - except for possibly
@@ -560,7 +546,6 @@ public static Object elementFromComplex(Object complex, String element)
                     readMethod = SimpleIntrospector.getReadMethod(clazz, element);
                 }
                 if (readMethod != null) {
-                    ReflectUtil.checkPackageAccess(readMethod.getDeclaringClass());
                     return MethodUtil.invoke(readMethod, complex, new Class<?>[0]);
                 }
 
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
index 85f433ab11f..fd7bf8fbcae 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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,10 +30,6 @@
 import static com.sun.jmx.defaults.JmxProperties.MBEANSERVER_LOGGER;
 
 import java.io.ObjectInputStream;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.Set;
 import java.lang.System.Logger.Level;
@@ -48,11 +44,9 @@
 import javax.management.ListenerNotFoundException;
 import javax.management.MBeanException;
 import javax.management.MBeanInfo;
-import javax.management.MBeanPermission;
 import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerDelegate;
-import javax.management.MBeanServerPermission;
 import javax.management.NotCompliantMBeanException;
 import javax.management.NotificationFilter;
 import javax.management.NotificationListener;
@@ -232,13 +226,7 @@ public final class JmxMBeanServer
 
         final MBeanInstantiator fInstantiator = instantiator;
         this.secureClr = new
-            SecureClassLoaderRepository(AccessController.doPrivileged(new PrivilegedAction<>() {
-                @Override
-                public ClassLoaderRepository run() {
-                    return fInstantiator.getClassLoaderRepository();
-                }
-            })
-        );
+            SecureClassLoaderRepository(fInstantiator.getClassLoaderRepository());
         if (delegate == null)
             delegate = new MBeanServerDelegateImpl();
         if (outer == null)
@@ -947,9 +935,6 @@ public MBeanInfo getMBeanInfo(ObjectName name) throws
     public Object instantiate(String className)
         throws ReflectionException, MBeanException {
 
-        /* Permission check */
-        checkMBeanPermission(className, null, null, "instantiate");
-
         return instantiator.instantiate(className);
     }
 
@@ -984,9 +969,6 @@ public Object instantiate(String className, ObjectName loaderName)
         throws ReflectionException, MBeanException,
                InstanceNotFoundException {
 
-        /* Permission check */
-        checkMBeanPermission(className, null, null, "instantiate");
-
         ClassLoader myLoader = outerShell.getClass().getClassLoader();
         return instantiator.instantiate(className, loaderName, myLoader);
     }
@@ -1022,9 +1004,6 @@ public Object instantiate(String className, Object params[],
                               String signature[])
         throws ReflectionException, MBeanException {
 
-        /* Permission check */
-        checkMBeanPermission(className, null, null, "instantiate");
-
         ClassLoader myLoader = outerShell.getClass().getClassLoader();
         return instantiator.instantiate(className, params, signature,
                                         myLoader);
@@ -1065,9 +1044,6 @@ public Object instantiate(String className, ObjectName loaderName,
         throws ReflectionException, MBeanException,
                InstanceNotFoundException {
 
-        /* Permission check */
-        checkMBeanPermission(className, null, null, "instantiate");
-
         ClassLoader myLoader = outerShell.getClass().getClassLoader();
         return instantiator.instantiate(className,loaderName,params,signature,
                                         myLoader);
@@ -1112,8 +1088,6 @@ public boolean isInstanceOf(ObjectName name, String className)
     public ObjectInputStream deserialize(ObjectName name, byte[] data)
         throws InstanceNotFoundException, OperationsException {
 
-        /* Permission check */
-        // This call requires MBeanPermission 'getClassLoaderFor'
         final ClassLoader loader = getClassLoaderFor(name);
 
         return instantiator.deserialize(loader, data);
@@ -1145,8 +1119,6 @@ public ObjectInputStream deserialize(String className, byte[] data)
                                         "Null className passed in parameter");
         }
 
-        /* Permission check */
-        // This call requires MBeanPermission 'getClassLoaderRepository'
         final ClassLoaderRepository clr = getClassLoaderRepository();
 
         Class<?> theClass;
@@ -1197,16 +1169,6 @@ public ObjectInputStream deserialize(String className,
         //
         loaderName = cloneObjectName(loaderName);
 
-        /* Permission check */
-        // Make this call just to force the 'getClassLoader'
-        // permission check
-        try {
-            getClassLoader(loaderName);
-        } catch (SecurityException e) {
-            throw e;
-        } catch (Exception e) {
-        }
-
         ClassLoader myLoader = outerShell.getClass().getClassLoader();
         return instantiator.deserialize(className, loaderName, data, myLoader);
     }
@@ -1222,14 +1184,7 @@ private void initialize() {
 
         // Registers the MBeanServer identification MBean
         try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<>() {
-                public Object run() throws Exception {
-                    mbsInterceptor.registerMBean(
-                            mBeanServerDelegateObject,
-                            MBeanServerDelegate.DELEGATE_NAME);
-                    return null;
-                }
-            });
+            mbsInterceptor.registerMBean(mBeanServerDelegateObject, MBeanServerDelegate.DELEGATE_NAME);
         } catch (SecurityException e) {
             if (MBEANSERVER_LOGGER.isLoggable(Level.DEBUG)) {
                 MBEANSERVER_LOGGER.log(Level.DEBUG,
@@ -1251,13 +1206,7 @@ public Object run() throws Exception {
            class loader.  The ClassLoaderRepository knows how
            to handle that case.  */
         ClassLoader myLoader = outerShell.getClass().getClassLoader();
-        final ModifiableClassLoaderRepository loaders = AccessController.doPrivileged(new PrivilegedAction<>() {
-
-            @Override
-            public ModifiableClassLoaderRepository run() {
-                return instantiator.getClassLoaderRepository();
-            }
-        });
+        final ModifiableClassLoaderRepository loaders = instantiator.getClassLoaderRepository();
 
         if (loaders != null) {
             loaders.addClassLoader(myLoader);
@@ -1266,17 +1215,8 @@ public ModifiableClassLoaderRepository run() {
                loaded by the bootstrap class loader we can still load
                MBeans from the classpath using
                createMBean(className, objectName).
+             */
 
-               If this class (JmxMBeanServer) was not loaded by the
-               system class loader or a parent of it, then the caller
-               must have RuntimePermission("getClassLoader") for the
-               getSystemClassLoader() call to succeed.  If the caller
-               does not have that permission, any call to
-               Class.getClassLoader() will fail.  Since there are lots
-               of those in JMX, we better throw the exception now.
-
-               This permission question is irrelevant when JMX is part
-               of J2SE (as of 1.5). */
             ClassLoader systemLoader = ClassLoader.getSystemClassLoader();
             if (systemLoader != myLoader)
                 loaders.addClassLoader(systemLoader);
@@ -1341,8 +1281,6 @@ public ClassLoader getClassLoader(ObjectName loaderName)
      * @return The ClassLoaderRepository for that MBeanServer.
      **/
     public ClassLoaderRepository getClassLoaderRepository() {
-        /* Permission check */
-        checkMBeanPermission(null, null, null, "getClassLoaderRepository");
         return secureClr;
     }
 
@@ -1425,8 +1363,6 @@ public static MBeanServer newMBeanServer(String defaultDomain,
         // Default is true.
         final boolean fairLock = DEFAULT_FAIR_LOCK_POLICY;
 
-        checkNewMBeanServerPermission();
-
         // This constructor happens to disregard the value of the interceptors
         // flag - that is, it always uses the default value - false.
         // This is admittedly a bug, but we chose not to fix it for now
@@ -1493,32 +1429,4 @@ private AttributeList cloneAttributeList(AttributeList list) {
         }
         return list;
     }
-
-    // SECURITY CHECKS
-    //----------------
-
-    private static void checkMBeanPermission(String classname,
-                                             String member,
-                                             ObjectName objectName,
-                                             String actions)
-        throws SecurityException {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Permission perm = new MBeanPermission(classname,
-                                                  member,
-                                                  objectName,
-                                                  actions);
-            sm.checkPermission(perm);
-        }
-    }
-
-    private static void checkNewMBeanServerPermission() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Permission perm = new MBeanServerPermission("newMBeanServer");
-            sm.checkPermission(perm);
-        }
-    }
 }
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
index 6de9ca2873c..53eeb721a13 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,18 +33,12 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.util.Map;
 import java.lang.System.Logger.Level;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
-import javax.management.MBeanPermission;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
 import javax.management.OperationsException;
@@ -53,7 +47,6 @@
 import javax.management.RuntimeMBeanException;
 import javax.management.RuntimeOperationsException;
 import sun.reflect.misc.ConstructorUtil;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * Implements the MBeanInstantiator interface. Provides methods for
@@ -95,7 +88,6 @@ public Class<?> findClassWithDefaultLoaderRepository(String className)
                              "Exception occurred during object instantiation");
         }
 
-        ReflectUtil.checkPackageAccess(className);
         try {
             if (clr == null) throw new ClassNotFoundException(className);
             theClass = clr.loadClass(className);
@@ -169,7 +161,6 @@ public Class<?>[] findSignatureClasses(String signature[],
                     continue;
                 }
 
-                ReflectUtil.checkPackageAccess(signature[i]);
                 // Ok we do not have a primitive type ! We need to build
                 // the signature of the method
                 //
@@ -210,8 +201,6 @@ public Class<?>[] findSignatureClasses(String signature[],
     public Object instantiate(Class<?> theClass)
         throws ReflectionException, MBeanException {
 
-        checkMBeanPermission(theClass, null, null, "instantiate");
-
         Object moi;
 
         // ------------------------------
@@ -223,7 +212,6 @@ public Object instantiate(Class<?> theClass)
         }
         // Instantiate the new object
         try {
-            ReflectUtil.checkPackageAccess(theClass);
             ensureClassAccess(theClass);
             moi= cons.newInstance();
         } catch (InvocationTargetException e) {
@@ -262,8 +250,6 @@ public Object instantiate(Class<?> theClass, Object params[],
                               String signature[], ClassLoader loader)
         throws ReflectionException, MBeanException {
 
-        checkMBeanPermission(theClass, null, null, "instantiate");
-
         // Instantiate the new object
         // ------------------------------
         // ------------------------------
@@ -293,7 +279,6 @@ public Object instantiate(Class<?> theClass, Object params[],
                 NoSuchMethodException("No such constructor"));
         }
         try {
-            ReflectUtil.checkPackageAccess(theClass);
             ensureClassAccess(theClass);
             moi = cons.newInstance(params);
         }
@@ -408,7 +393,6 @@ public ObjectInputStream deserialize(String className,
              IllegalArgumentException(), "Null className passed in parameter");
         }
 
-        ReflectUtil.checkPackageAccess(className);
         Class<?> theClass;
         if (loaderName == null) {
             // Load the class using the agent class loader
@@ -611,7 +595,6 @@ public Object instantiate(String className,
      * Return the Default Loader Repository used by this instantiator object.
      **/
     public ModifiableClassLoaderRepository getClassLoaderRepository() {
-        checkMBeanPermission((String)null, null, null, "getClassLoaderRepository");
         return clr;
     }
 
@@ -627,7 +610,6 @@ static Class<?> loadClass(String className, ClassLoader loader)
                 IllegalArgumentException("The class name cannot be null"),
                               "Exception occurred during object instantiation");
         }
-        ReflectUtil.checkPackageAccess(className);
         try {
             if (loader == null)
                 loader = MBeanInstantiator.class.getClassLoader();
@@ -678,7 +660,6 @@ static Class<?>[] loadSignatureClasses(String signature[],
                 // We need to load the class through the class
                 // loader of the target object.
                 //
-                ReflectUtil.checkPackageAccess(signature[i]);
                 tab[i] = Class.forName(signature[i], false, aLoader);
             }
         } catch (ClassNotFoundException e) {
@@ -715,31 +696,6 @@ private Constructor<?> findConstructor(Class<?> c, Class<?>[] params) {
             primitiveClasses.put(c.getName(), c);
     }
 
-    private static void checkMBeanPermission(Class<?> clazz,
-                                             String member,
-                                             ObjectName objectName,
-                                             String actions) {
-        if (clazz != null) {
-            checkMBeanPermission(clazz.getName(), member, objectName, actions);
-        }
-    }
-
-    private static void checkMBeanPermission(String classname,
-                                             String member,
-                                             ObjectName objectName,
-                                             String actions)
-        throws SecurityException {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Permission perm = new MBeanPermission(classname,
-                                                  member,
-                                                  objectName,
-                                                  actions);
-            sm.checkPermission(perm);
-        }
-    }
-
     private static void ensureClassAccess(Class<?> clazz)
             throws IllegalAccessException
     {
@@ -752,20 +708,8 @@ private static void ensureClassAccess(Class<?> clazz)
     private ClassLoader getClassLoader(final ObjectName name) {
         if(clr == null){
             return null;
+        } else {
+            return clr.getClassLoader(name);
         }
-        // Restrict to getClassLoader permission only
-        Permissions permissions = new Permissions();
-        permissions.add(new MBeanPermission("*", null, name, "getClassLoader"));
-        ProtectionDomain protectionDomain = new ProtectionDomain(null, permissions);
-        ProtectionDomain[] domains = {protectionDomain};
-        @SuppressWarnings("removal")
-        AccessControlContext ctx = new AccessControlContext(domains);
-        @SuppressWarnings("removal")
-        ClassLoader loader = AccessController.doPrivileged(new PrivilegedAction<>() {
-            public ClassLoader run() {
-                return clr.getClassLoader(name);
-            }
-        }, ctx);
-        return loader;
     }
 }
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java
index b80bb165a7b..fdbb961630c 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, 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
@@ -50,7 +50,6 @@
 import javax.management.NotCompliantMBeanException;
 import javax.management.NotificationBroadcaster;
 import javax.management.ReflectionException;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * An introspector for MBeans of a certain type.  There is one instance
@@ -176,7 +175,6 @@ abstract MBeanOperationInfo getMBeanOperationInfo(String operationName,
      * Get the methods to be analyzed to build the MBean interface.
      */
     final List<Method> getMethods(final Class<?> mbeanType) {
-        ReflectUtil.checkPackageAccess(mbeanType);
         return Arrays.asList(mbeanType.getMethods());
     }
 
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
index ec40a30406b..f63222f251f 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, 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
@@ -38,7 +38,6 @@
 import javax.management.ObjectName;
 import javax.management.ReflectionException;
 import com.sun.jmx.mbeanserver.MXBeanMappingFactory;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * Base class for MBeans.  There is one instance of this class for
@@ -132,7 +131,6 @@ <T> MBeanSupport(T resource, Class<T> mbeanInterfaceType)
                 " is not an instance of " + mbeanInterfaceType.getName();
             throw new NotCompliantMBeanException(msg);
         }
-        ReflectUtil.checkPackageAccess(mbeanInterfaceType);
         this.resource = resource;
         MBeanIntrospector<M> introspector = getMBeanIntrospector();
         this.perInterface = introspector.getPerInterface(mbeanInterfaceType);
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java
index fd291133d08..0027710d06a 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, 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,7 +30,6 @@
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
-import java.security.AccessController;
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.JMX;
 import javax.management.MBeanServerConnection;
@@ -145,9 +144,7 @@ synchronized void addReference(ObjectName name, Object mxbean)
     throws InstanceAlreadyExistsException {
         ObjectName existing = mxbeanToObjectName.get(mxbean);
         if (existing != null) {
-            @SuppressWarnings("removal")
-            String multiname = AccessController.doPrivileged(
-                    new GetPropertyAction("jmx.mxbean.multiname"));
+            String multiname = System.getProperty("jmx.mxbean.multiname");
             if (!"true".equalsIgnoreCase(multiname)) {
                 throw new InstanceAlreadyExistsException(
                         "MXBean already registered with name " + existing);
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java
index 4f3e4a43893..339b708ef18 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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 @@
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * This class deserializes an object in the context of a specific class loader.
@@ -61,7 +60,6 @@ protected Class<?> resolveClass(ObjectStreamClass aClass)
             return super.resolveClass(aClass);
         } else {
             String name = aClass.getName();
-            ReflectUtil.checkPackageAccess(name);
             // Query the class loader ...
             return Class.forName(name, false, loader);
         }
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java
index 9522208aafe..6684e0390cf 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/PerInterface.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
@@ -25,7 +25,6 @@
 
 package com.sun.jmx.mbeanserver;
 
-import java.security.AccessController;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -175,15 +174,7 @@ private Object noSuchMethod(String msg, Object resource, String operation,
             throw exception; // No compatibility requirement here
 
         // Is the compatibility property set?
-        GetPropertyAction act = new GetPropertyAction("jmx.invoke.getters");
-        String invokeGettersS;
-        try {
-            invokeGettersS = AccessController.doPrivileged(act);
-        } catch (Exception e) {
-            // We don't expect an exception here but if we get one then
-            // we'll simply assume that the property is not set.
-            invokeGettersS = null;
-        }
+        String invokeGettersS = System.getProperty("jmx.invoke.getters");
         if (invokeGettersS == null)
             throw exception;
 
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
index b2f8e4c028e..d06456a73dd 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.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
@@ -25,10 +25,6 @@
 
 package com.sun.jmx.remote.internal;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -396,20 +392,6 @@ public void dispose() {
 
                 if (nextSeq < nextSequenceNumber()) {
                     candidate = notificationAt(nextSeq);
-                    // Skip security check if NotificationBufferFilter is not overloaded
-                    if (!(filter instanceof ServerNotifForwarder.NotifForwarderBufferFilter)) {
-                        try {
-                            ServerNotifForwarder.checkMBeanPermission(this.mBeanServer,
-                                                      candidate.getObjectName(),"addNotificationListener");
-                        } catch (InstanceNotFoundException | SecurityException e) {
-                            if (logger.debugOn()) {
-                                logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
-                            }
-                            ++nextSeq;
-                            continue;
-                        }
-                    }
-
                     if (logger.debugOn()) {
                         logger.debug("fetchNotifications", "candidate: " +
                                      candidate);
@@ -653,54 +635,27 @@ private void removeBufferListener(ObjectName name) {
         }
     }
 
-    @SuppressWarnings("removal")
     private void addNotificationListener(final ObjectName name,
                                          final NotificationListener listener,
                                          final NotificationFilter filter,
                                          final Object handback)
             throws Exception {
-        try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-                public Void run() throws InstanceNotFoundException {
-                    mBeanServer.addNotificationListener(name,
-                                                        listener,
-                                                        filter,
-                                                        handback);
-                    return null;
-                }
-            });
-        } catch (Exception e) {
-            throw extractException(e);
-        }
+        mBeanServer.addNotificationListener(name,
+                                                listener,
+                                                filter,
+                                                handback);
     }
 
-    @SuppressWarnings("removal")
     private void removeNotificationListener(final ObjectName name,
                                             final NotificationListener listener)
             throws Exception {
-        try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-                public Void run() throws Exception {
-                    mBeanServer.removeNotificationListener(name, listener);
-                    return null;
-                }
-            });
-        } catch (Exception e) {
-            throw extractException(e);
-        }
+        mBeanServer.removeNotificationListener(name, listener);
     }
 
-    @SuppressWarnings("removal")
     private Set<ObjectName> queryNames(final ObjectName name,
                                        final QueryExp query) {
-        PrivilegedAction<Set<ObjectName>> act =
-            new PrivilegedAction<>() {
-                public Set<ObjectName> run() {
-                    return mBeanServer.queryNames(name, query);
-                }
-            };
         try {
-            return AccessController.doPrivileged(act);
+            return mBeanServer.queryNames(name, query);
         } catch (RuntimeException e) {
             logger.fine("queryNames", "Failed to query names: " + e);
             logger.debug("queryNames", e);
@@ -708,18 +663,11 @@ public Set<ObjectName> run() {
         }
     }
 
-    @SuppressWarnings("removal")
     private static boolean isInstanceOf(final MBeanServer mbs,
                                         final ObjectName name,
                                         final String className) {
-        PrivilegedExceptionAction<Boolean> act =
-            new PrivilegedExceptionAction<>() {
-                public Boolean run() throws InstanceNotFoundException {
-                    return mbs.isInstanceOf(name, className);
-                }
-            };
         try {
-            return AccessController.doPrivileged(act);
+            return mbs.isInstanceOf(name, className);
         } catch (Exception e) {
             logger.fine("isInstanceOf", "failed: " + e);
             logger.debug("isInstanceOf", e);
@@ -825,17 +773,6 @@ private void checkNoLocks() {
             logger.warning("checkNoLocks", "lock protocol violation");
     }
 
-    /**
-     * Iterate until we extract the real exception
-     * from a stack of PrivilegedActionExceptions.
-     */
-    private static Exception extractException(Exception e) {
-        while (e instanceof PrivilegedActionException) {
-            e = ((PrivilegedActionException)e).getException();
-        }
-        return e;
-    }
-
     private static final ClassLogger logger =
         new ClassLogger("javax.management.remote.misc",
                         "ArrayNotificationBuffer");
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java
index 471cccecc8a..87947e06ac8 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java
@@ -33,9 +33,6 @@
 import java.util.Map;
 import java.util.concurrent.Executor;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import javax.security.auth.Subject;
 
 import javax.management.Notification;
@@ -56,9 +53,6 @@
 
 public abstract class ClientNotifForwarder {
 
-    @SuppressWarnings("removal")
-    private final AccessControlContext acc;
-
     public ClientNotifForwarder(Map<String, ?> env) {
         this(null, env);
     }
@@ -139,7 +133,6 @@ else if (logger.traceOn())
 
         this.defaultClassLoader = defaultClassLoader;
         this.executor = ex;
-        this.acc = AccessController.getContext();
     }
 
     /**
@@ -419,40 +412,14 @@ private void logOnce(String msg, SecurityException x) {
         }
 
         // Set new context class loader, returns previous one.
-        @SuppressWarnings("removal")
         private final ClassLoader setContextClassLoader(final ClassLoader loader) {
-            final AccessControlContext ctxt = ClientNotifForwarder.this.acc;
-            // if ctxt is null, log a config message and throw a
-            // SecurityException.
-            if (ctxt == null) {
-                logOnce("AccessControlContext must not be null.",null);
-                throw new SecurityException("AccessControlContext must not be null");
-            }
-            return AccessController.doPrivileged(
-                new PrivilegedAction<>() {
-                    public ClassLoader run() {
-                        try {
-                            // get context class loader - may throw
-                            // SecurityException - though unlikely.
-                            final ClassLoader previous =
-                                Thread.currentThread().getContextClassLoader();
-
-                            // if nothing needs to be done, break here...
-                            if (loader == previous) return previous;
-
-                            // reset context class loader - may throw
-                            // SecurityException
-                            Thread.currentThread().setContextClassLoader(loader);
-                            return previous;
-                        } catch (SecurityException x) {
-                            logOnce("Permission to set ContextClassLoader missing. " +
-                                    "Notifications will not be dispatched. " +
-                                    "Please check your Java policy configuration: " +
-                                    x, x);
-                            throw x;
-                        }
-                    }
-                }, ctxt);
+            final ClassLoader previous = Thread.currentThread().getContextClassLoader();
+
+            // if nothing needs to be done, break here...
+            if (loader == previous) return previous;
+
+            Thread.currentThread().setContextClassLoader(loader);
+            return previous;
         }
 
         public void run() {
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
index dd557523e65..a1f5ece89a2 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
@@ -29,10 +29,6 @@
 import com.sun.jmx.remote.util.ClassLogger;
 import com.sun.jmx.remote.util.EnvHelp;
 import java.io.IOException;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -85,30 +81,16 @@ public Integer addNotificationListener(final ObjectName name,
 
         checkState();
 
-        // Explicitly check MBeanPermission for addNotificationListener
-        //
-        checkMBeanPermission(name, "addNotificationListener");
         if (notificationAccessController != null) {
             notificationAccessController.addNotificationListener(
                 connectionId, name, getSubject());
         }
-        try {
-            @SuppressWarnings("removal")
-            boolean instanceOf =
-            AccessController.doPrivileged(
-                    new PrivilegedExceptionAction<>() {
-                        public Boolean run() throws InstanceNotFoundException {
-                            return mbeanServer.isInstanceOf(name, broadcasterClass);
-                        }
-            });
-            if (!instanceOf) {
-                throw new IllegalArgumentException("The specified MBean [" +
-                    name + "] is not a " +
-                    "NotificationBroadcaster " +
-                    "object.");
-            }
-        } catch (PrivilegedActionException e) {
-            throw (InstanceNotFoundException) extractException(e);
+        boolean instanceOf = mbeanServer.isInstanceOf(name, broadcasterClass);
+        if (!instanceOf) {
+            throw new IllegalArgumentException("The specified MBean [" +
+                name + "] is not a " +
+                "NotificationBroadcaster " +
+                "object.");
         }
 
         final Integer id = getListenerID();
@@ -154,9 +136,6 @@ public void removeNotificationListener(ObjectName name,
 
         checkState();
 
-        // Explicitly check MBeanPermission for removeNotificationListener
-        //
-        checkMBeanPermission(name, "removeNotificationListener");
         if (notificationAccessController != null) {
             notificationAccessController.removeNotificationListener(
                 connectionId, name, getSubject());
@@ -373,55 +352,12 @@ private Integer getListenerID() {
         }
     }
 
-    /**
-     * Explicitly check the MBeanPermission for
-     * the current access control context.
-     */
-    public final void checkMBeanPermission(
-            final ObjectName name, final String actions)
-            throws InstanceNotFoundException, SecurityException {
-        checkMBeanPermission(mbeanServer,name,actions);
-    }
-
-    @SuppressWarnings("removal")
-    static void checkMBeanPermission(
-            final MBeanServer mbs, final ObjectName name, final String actions)
-            throws InstanceNotFoundException, SecurityException {
-
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            AccessControlContext acc = AccessController.getContext();
-            ObjectInstance oi;
-            try {
-                oi = AccessController.doPrivileged(
-                    new PrivilegedExceptionAction<>() {
-                        public ObjectInstance run()
-                        throws InstanceNotFoundException {
-                            return mbs.getObjectInstance(name);
-                        }
-                });
-            } catch (PrivilegedActionException e) {
-                throw (InstanceNotFoundException) extractException(e);
-            }
-            String classname = oi.getClassName();
-            MBeanPermission perm = new MBeanPermission(
-                classname,
-                null,
-                name,
-                actions);
-            sm.checkPermission(perm, acc);
-        }
-    }
-
     /**
      * Check if the caller has the right to get the following notifications.
      */
     private boolean allowNotificationEmission(ObjectName name,
                                               TargetedNotification tn) {
         try {
-            if (checkNotificationEmission) {
-                checkMBeanPermission(name, "addNotificationListener");
-            }
             if (notificationAccessController != null) {
                 notificationAccessController.fetchNotification(
                         connectionId, name, tn.getNotification(), getSubject());
@@ -444,17 +380,6 @@ private boolean allowNotificationEmission(ObjectName name,
         }
     }
 
-    /**
-     * Iterate until we extract the real exception
-     * from a stack of PrivilegedActionExceptions.
-     */
-    private static Exception extractException(Exception e) {
-        while (e instanceof PrivilegedActionException) {
-            e = ((PrivilegedActionException)e).getException();
-        }
-        return e;
-    }
-
     private static class IdAndFilter {
         private Integer id;
         private NotificationFilter filter;
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java b/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
index bb5d5e88ff3..65a1b424477 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
@@ -24,13 +24,9 @@
  */
 package com.sun.jmx.remote.security;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import com.sun.jmx.mbeanserver.Util;
 import java.io.File;
-import java.io.FilePermission;
 import java.io.IOException;
-import java.security.AccessControlException;
-import java.security.AccessController;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -109,12 +105,9 @@ public class FileLoginModule implements LoginModule {
     private static final String PASSWORD_FILE_NAME = "jmxremote.password";
 
     // Location of the default password file
-    @SuppressWarnings("removal")
     private static final String DEFAULT_PASSWORD_FILE_NAME =
-        AccessController.doPrivileged(new GetPropertyAction("java.home")) +
-        File.separatorChar + "conf" +
-        File.separatorChar + "management" + File.separatorChar +
-        PASSWORD_FILE_NAME;
+        System.getProperty("java.home") + File.separatorChar + "conf" + File.separatorChar
+        + "management" + File.separatorChar + PASSWORD_FILE_NAME;
 
     // Key to retrieve the stored username
     private static final String USERNAME_KEY =
@@ -152,7 +145,6 @@ public class FileLoginModule implements LoginModule {
     private String passwordFile;
     private String passwordFileDisplayName;
     private boolean userSuppliedPasswordFile;
-    private boolean hasJavaHomePermission;
     private HashedPasswordManager hashPwdMgr;
 
     /**
@@ -196,14 +188,7 @@ public void initialize(Subject subject, CallbackHandler callbackHandler,
         if (passwordFile == null) {
             passwordFile = DEFAULT_PASSWORD_FILE_NAME;
             userSuppliedPasswordFile = false;
-            try {
-                System.getProperty("java.home");
-                hasJavaHomePermission = true;
-                passwordFileDisplayName = passwordFile;
-            } catch (SecurityException e) {
-                hasJavaHomePermission = false;
-                passwordFileDisplayName = PASSWORD_FILE_NAME;
-            }
+            passwordFileDisplayName = passwordFile;
         }
     }
 
@@ -233,18 +218,6 @@ public boolean login() throws LoginException {
                     "Error: unable to load the password file: " +
                     passwordFileDisplayName);
             throw EnvHelp.initCause(le, ioe);
-        } catch (SecurityException e) {
-            if (userSuppliedPasswordFile || hasJavaHomePermission) {
-                throw e;
-            } else {
-                final FilePermission fp
-                        = new FilePermission(passwordFileDisplayName, "read");
-                @SuppressWarnings("removal")
-                AccessControlException ace = new AccessControlException(
-                        "access denied " + fp.toString());
-                ace.initCause(e);
-                throw ace;
-            }
         }
 
         if (logger.debugOn()) {
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/HashedPasswordManager.java b/src/java.management/share/classes/com/sun/jmx/remote/security/HashedPasswordManager.java
index 8de1a71fd6a..c50b22fade6 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/security/HashedPasswordManager.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/security/HashedPasswordManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -232,16 +232,9 @@ public synchronized boolean authenticate(String userName, char[] inputPassword)
      * SHA3-512 hash
      *
      * @throws IOException If unable to access the file
-     * @throws SecurityException If read/write file permissions are not granted
      */
     public synchronized void loadPasswords()
-            throws IOException, SecurityException {
-
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkRead(passwordFile);
-        }
+            throws IOException {
 
         AtomicBoolean hasClearPasswords = new AtomicBoolean(false);
         StringBuilder sbuf = new StringBuilder();
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java b/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
index f67bde263ea..89a77b3ddaf 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,11 +26,8 @@
 package com.sun.jmx.remote.security;
 
 import java.io.IOException;
-import java.security.AccessController;
 import java.security.Principal;
 import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -105,32 +102,10 @@ public JMXPluggableAuthenticator(Map<?, ?> env) {
 
             } else {
                 // use the default JAAS login configuration (file-based)
-                @SuppressWarnings("removal")
-                SecurityManager sm = System.getSecurityManager();
-                if (sm != null) {
-                    sm.checkPermission(
-                            new AuthPermission("createLoginContext." +
-                                               LOGIN_CONFIG_NAME));
-                }
-
-                final String pf = passwordFile;
-                final String hashPass = hashPasswords;
-                try {
-                    @SuppressWarnings("removal")
-                    var tmp = AccessController.doPrivileged(
-                        new PrivilegedExceptionAction<LoginContext>() {
-                            public LoginContext run() throws LoginException {
-                                return new LoginContext(
-                                                LOGIN_CONFIG_NAME,
+                loginContext = new LoginContext(LOGIN_CONFIG_NAME,
                                                 null,
                                                 new JMXCallbackHandler(),
-                                                new FileLoginConfig(pf, hashPass));
-                            }
-                        });
-                    loginContext = tmp;
-                } catch (PrivilegedActionException pae) {
-                    throw (LoginException) pae.getException();
-                }
+                                                new FileLoginConfig(passwordFile, hashPasswords));
             }
 
         } catch (LoginException | SecurityException e) {
@@ -190,14 +165,7 @@ public Subject authenticate(Object credentials) {
         try {
             loginContext.login();
             final Subject subject = loginContext.getSubject();
-            @SuppressWarnings("removal")
-            var dummy = AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                    public Void run() {
-                        subject.setReadOnly();
-                        return null;
-                    }
-                });
-
+            subject.setReadOnly();
             return subject;
 
         } catch (LoginException le) {
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java b/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java
deleted file mode 100644
index a8f97fad1e4..00000000000
--- a/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.jmx.remote.security;
-
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Permissions;
-import java.security.ProtectionDomain;
-import javax.security.auth.Subject;
-import javax.security.auth.SubjectDomainCombiner;
-
-/**
- * <p>This class represents an extension to the {@link SubjectDomainCombiner}
- * and is used to add a new {@link ProtectionDomain}, comprised of a null
- * codesource/signers and an empty permission set, to the access control
- * context with which this combiner is combined.</p>
- *
- * <p>When the {@link #combine} method is called the {@link ProtectionDomain}
- * is augmented with the permissions granted to the set of principals present
- * in the supplied {@link Subject}.</p>
- */
-@SuppressWarnings("removal")
-public class JMXSubjectDomainCombiner extends SubjectDomainCombiner {
-
-    public JMXSubjectDomainCombiner(Subject s) {
-        super(s);
-    }
-
-    public ProtectionDomain[] combine(ProtectionDomain[] current,
-                                      ProtectionDomain[] assigned) {
-        // Add a new ProtectionDomain with the null codesource/signers, and
-        // the empty permission set, to the end of the array containing the
-        // 'current' protections domains, i.e. the ones that will be augmented
-        // with the permissions granted to the set of principals present in
-        // the supplied subject.
-        //
-        ProtectionDomain[] newCurrent;
-        if (current == null || current.length == 0) {
-            newCurrent = new ProtectionDomain[1];
-            newCurrent[0] = pdNoPerms;
-        } else {
-            newCurrent = new ProtectionDomain[current.length + 1];
-            for (int i = 0; i < current.length; i++) {
-                newCurrent[i] = current[i];
-            }
-            newCurrent[current.length] = pdNoPerms;
-        }
-        return super.combine(newCurrent, assigned);
-    }
-
-    /**
-     * A null CodeSource.
-     */
-    private static final CodeSource nullCodeSource =
-        new CodeSource(null, (java.security.cert.Certificate[]) null);
-
-    /**
-     * A ProtectionDomain with a null CodeSource and an empty permission set.
-     */
-    private static final ProtectionDomain pdNoPerms =
-        new ProtectionDomain(nullCodeSource, new Permissions(), null, null);
-
-    /**
-     * Get the current AccessControlContext combined with the supplied subject.
-     */
-    public static AccessControlContext getContext(Subject subject) {
-        return new AccessControlContext(AccessController.getContext(),
-                                        new JMXSubjectDomainCombiner(subject));
-    }
-
-    /**
-     * Get the AccessControlContext of the domain combiner created with
-     * the supplied subject, i.e. an AccessControlContext with the domain
-     * combiner created with the supplied subject and where the caller's
-     * context has been removed.
-     */
-    public static AccessControlContext
-        getDomainCombinerContext(Subject subject) {
-        return new AccessControlContext(
-            new AccessControlContext(new ProtectionDomain[0]),
-            new JMXSubjectDomainCombiner(subject));
-    }
-}
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java b/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java
index c94750e99ff..7fd7fcb2dd2 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java
@@ -25,9 +25,7 @@
 
 package com.sun.jmx.remote.security;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import java.io.ObjectInputStream;
-import java.security.AccessController;
 import java.util.Set;
 import javax.management.Attribute;
 import javax.management.AttributeList;
@@ -74,13 +72,8 @@
  * be overridden, for instance if the default checking behavior is
  * inappropriate.</p>
  *
- * <p>If there is no SecurityManager, then the access controller will refuse
- * to create an MBean that is a ClassLoader.  This prevents
- * people from opening security holes unintentionally. Otherwise, it
- * would not be obvious that granting write access grants the ability to
- * download and execute arbitrary code in the target MBean server. Advanced
- * users who do want an MBean which is a ClassLoader are presumably advanced enough
- * to handle policy files and security managers.</p>
+ * <p>The access controller will refuse to create an MBean that is a ClassLoader.
+ * </p>
  */
 public abstract class MBeanServerAccessController
         implements MBeanServerForwarder {
@@ -174,15 +167,9 @@ public ObjectInstance createMBean(String className, ObjectName name)
         MBeanException,
         NotCompliantMBeanException {
         checkCreate(className);
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            Object object = getMBeanServer().instantiate(className);
-            checkClassLoader(object);
-            return getMBeanServer().registerMBean(object, name);
-        } else {
-            return getMBeanServer().createMBean(className, name);
-        }
+        Object object = getMBeanServer().instantiate(className);
+        checkClassLoader(object);
+        return getMBeanServer().registerMBean(object, name);
     }
 
     /**
@@ -198,18 +185,11 @@ public ObjectInstance createMBean(String className, ObjectName name,
         MBeanException,
         NotCompliantMBeanException {
         checkCreate(className);
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            Object object = getMBeanServer().instantiate(className,
-                                                         params,
-                                                         signature);
-            checkClassLoader(object);
-            return getMBeanServer().registerMBean(object, name);
-        } else {
-            return getMBeanServer().createMBean(className, name,
-                                                params, signature);
-        }
+        Object object = getMBeanServer().instantiate(className,
+                                                     params,
+                                                     signature);
+        checkClassLoader(object);
+        return getMBeanServer().registerMBean(object, name);
     }
 
     /**
@@ -227,16 +207,10 @@ public ObjectInstance createMBean(String className,
         NotCompliantMBeanException,
         InstanceNotFoundException {
         checkCreate(className);
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            Object object = getMBeanServer().instantiate(className,
-                                                         loaderName);
-            checkClassLoader(object);
-            return getMBeanServer().registerMBean(object, name);
-        } else {
-            return getMBeanServer().createMBean(className, name, loaderName);
-        }
+        Object object = getMBeanServer().instantiate(className,
+                                                     loaderName);
+        checkClassLoader(object);
+        return getMBeanServer().registerMBean(object, name);
     }
 
     /**
@@ -256,19 +230,12 @@ public ObjectInstance createMBean(String className,
         NotCompliantMBeanException,
         InstanceNotFoundException {
         checkCreate(className);
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) {
-            Object object = getMBeanServer().instantiate(className,
-                                                         loaderName,
-                                                         params,
-                                                         signature);
-            checkClassLoader(object);
-            return getMBeanServer().registerMBean(object, name);
-        } else {
-            return getMBeanServer().createMBean(className, name, loaderName,
-                                                params, signature);
-        }
+        Object object = getMBeanServer().instantiate(className,
+                                                     loaderName,
+                                                     params,
+                                                     signature);
+        checkClassLoader(object);
+        return getMBeanServer().registerMBean(object, name);
     }
 
     /**
@@ -614,8 +581,7 @@ private void checkClassLoader(Object object) {
         if (object instanceof ClassLoader)
             throw new SecurityException("Access denied! Creating an " +
                                         "MBean that is a ClassLoader " +
-                                        "is forbidden unless a security " +
-                                        "manager is installed.");
+                                        "is forbidden.");
     }
 
     //------------------
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java b/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java
index 3dcadb56325..a64db45c22f 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.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
@@ -39,14 +39,11 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import java.security.AccessController;
-
 import javax.management.ObjectName;
 import javax.management.MBeanServer;
 import javax.management.InstanceNotFoundException;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXConnectorServerFactory;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import com.sun.jmx.remote.security.NotificationAccessController;
 
 public class EnvHelp {
@@ -272,13 +269,11 @@ public static int getNotifBufferSize(Map<String, ?> env) {
 
         // the default value re-specified in the system
         try {
-            GetPropertyAction act = new GetPropertyAction(BUFFER_SIZE_PROPERTY);
-            String s = AccessController.doPrivileged(act);
+            String s = System.getProperty(BUFFER_SIZE_PROPERTY);
             if (s != null) {
                 defaultQueueSize = Integer.parseInt(s);
             } else { // try the old one
-                act = new GetPropertyAction(oldP);
-                s = AccessController.doPrivileged(act);
+                s = System.getProperty(oldP);
                 if (s != null) {
                     defaultQueueSize = Integer.parseInt(s);
                 }
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java b/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java
index cc22f207c29..b2449648292 100644
--- a/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java
+++ b/src/java.management/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, 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
@@ -25,8 +25,6 @@
 
 package com.sun.jmx.remote.util;
 
-import sun.reflect.misc.ReflectUtil;
-
 public class OrderClassLoaders extends ClassLoader {
     public OrderClassLoaders(ClassLoader cl1, ClassLoader cl2) {
         super(cl1);
@@ -35,7 +33,6 @@ public OrderClassLoaders(ClassLoader cl1, ClassLoader cl2) {
     }
 
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-        ReflectUtil.checkPackageAccess(name);
         try {
             return super.loadClass(name, resolve);
         } catch (ClassNotFoundException cne) {
diff --git a/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
index 03bbcead194..547d7da9692 100644
--- a/src/java.management/share/classes/java/lang/management/ManagementFactory.java
+++ b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
@@ -25,24 +25,20 @@
 
 package java.lang.management;
 
-import java.io.FilePermission;
 import java.io.IOException;
 import javax.management.DynamicMBean;
+import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerConnection;
 import javax.management.MBeanServerFactory;
-import javax.management.MBeanServerPermission;
+import javax.management.NotCompliantMBeanException;
 import javax.management.NotificationEmitter;
 import javax.management.ObjectName;
+import javax.management.InstanceAlreadyExistsException;
 import javax.management.InstanceNotFoundException;
 import javax.management.MalformedObjectNameException;
 import javax.management.StandardEmitterMBean;
 import javax.management.StandardMBean;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -469,13 +465,6 @@ public static List<GarbageCollectorMXBean> getGarbageCollectorMXBeans() {
      * @see javax.management.MBeanServerFactory#createMBeanServer
      */
     public static synchronized MBeanServer getPlatformMBeanServer() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Permission perm = new MBeanServerPermission("createMBeanServer");
-            sm.checkPermission(perm);
-        }
-
         if (platformMBeanServer == null) {
             platformMBeanServer = MBeanServerFactory.createMBeanServer();
             platformComponents()
@@ -594,10 +583,7 @@ public static synchronized MBeanServer getPlatformMBeanServer() {
         // Only allow MXBean interfaces from the platform modules loaded by the
         // bootstrap or platform class loader
         final Class<?> cls = mxbeanInterface;
-        @SuppressWarnings("removal")
-        ClassLoader loader =
-            AccessController.doPrivileged(
-                (PrivilegedAction<ClassLoader>) () -> cls.getClassLoader());
+        ClassLoader loader = cls.getClassLoader();
         if (!jdk.internal.misc.VM.isSystemDomainLoader(loader)) {
             throw new IllegalArgumentException(mxbeanName +
                 " is not a platform MXBean");
@@ -882,29 +868,22 @@ private static Stream<String> getProxyNames(PlatformComponent<?> pc,
     private static final String NOTIF_EMITTER =
         "javax.management.NotificationEmitter";
 
-    @SuppressWarnings("removal")
     private static void addMXBean(final MBeanServer mbs, String name, final Object pmo)
     {
         try {
             ObjectName oname = ObjectName.getInstance(name);
             // Make DynamicMBean out of MXBean by wrapping it with a StandardMBean
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                final DynamicMBean dmbean;
-                if (pmo instanceof DynamicMBean) {
-                    dmbean = DynamicMBean.class.cast(pmo);
-                } else if (pmo instanceof NotificationEmitter) {
-                    dmbean = new StandardEmitterMBean(pmo, null, true, (NotificationEmitter) pmo);
-                } else {
-                    dmbean = new StandardMBean(pmo, null, true);
-                }
-
-                mbs.registerMBean(dmbean, oname);
-                return null;
-            });
-        } catch (MalformedObjectNameException mone) {
-            throw new IllegalArgumentException(mone);
-        } catch (PrivilegedActionException e) {
-            throw new RuntimeException(e.getException());
+            final DynamicMBean dmbean;
+            if (pmo instanceof DynamicMBean) {
+                dmbean = DynamicMBean.class.cast(pmo);
+            } else if (pmo instanceof NotificationEmitter) {
+                dmbean = new StandardEmitterMBean(pmo, null, true, (NotificationEmitter) pmo);
+            } else {
+                dmbean = new StandardMBean(pmo, null, true);
+            }
+            mbs.registerMBean(dmbean, oname);
+        } catch (MalformedObjectNameException | InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException e) {
+            throw new IllegalArgumentException(e);
         }
     }
 
@@ -918,19 +897,11 @@ private static class PlatformMBeanFinder {
 
         static {
             // get all providers
-            @SuppressWarnings("removal")
-            List<PlatformMBeanProvider> providers = AccessController.doPrivileged(
-                new PrivilegedAction<>() {
-                    @Override
-                    public List<PlatformMBeanProvider> run() {
-                        List<PlatformMBeanProvider> all = new ArrayList<>();
-                        for (PlatformMBeanProvider provider : ServiceLoader.loadInstalled(PlatformMBeanProvider.class)) {
-                            all.add(provider);
-                        }
-                        all.add(new DefaultPlatformMBeanProvider());
-                        return all;
-                    }
-                }, null, new FilePermission("<<ALL FILES>>", "read"));
+            List<PlatformMBeanProvider> providers = new ArrayList<>();
+            for (PlatformMBeanProvider provider : ServiceLoader.loadInstalled(PlatformMBeanProvider.class)) {
+                providers.add(provider);
+            }
+            providers.add(new DefaultPlatformMBeanProvider());
 
             // load all platform components into a map
             var map = new HashMap<String, PlatformComponent<?>>();
@@ -1013,11 +984,8 @@ static PlatformComponent<?> findSingleton(Class<?> mbeanIntf)
         loadNativeLib();
     }
 
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings("restricted")
     private static void loadNativeLib() {
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            System.loadLibrary("management");
-            return null;
-        });
+        System.loadLibrary("management");
     }
 }
diff --git a/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java b/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java
index 30a399ad6a1..d2aae5cda08 100644
--- a/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java
@@ -25,9 +25,6 @@
 
 package java.lang.management;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
 /**
  * The management interface for the runtime system of
  * the Java virtual machine.
@@ -76,8 +73,7 @@ public interface RuntimeMXBean extends PlatformManagedObject {
      */
     @SuppressWarnings("removal")
     public default long getPid() {
-        return AccessController.doPrivileged((PrivilegedAction<Long>)
-                () -> ProcessHandle.current().pid());
+        return ProcessHandle.current().pid();
     }
 
     /**
diff --git a/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java b/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java
index f7c40691e39..43f3f428fab 100644
--- a/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java
+++ b/src/java.management/share/classes/javax/management/ClassAttributeValueExp.java
@@ -25,10 +25,6 @@
 
 package javax.management;
 
-import java.security.AccessController;
-
-import com.sun.jmx.mbeanserver.GetPropertyAction;
-
 /**
  * This class represents the name of the Java implementation class of
  * the MBean. It is used for performing queries based on the class of
diff --git a/src/java.management/share/classes/javax/management/JMX.java b/src/java.management/share/classes/javax/management/JMX.java
index f1dba270579..82b14c691b4 100644
--- a/src/java.management/share/classes/javax/management/JMX.java
+++ b/src/java.management/share/classes/javax/management/JMX.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, 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
@@ -29,7 +29,6 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * Static methods from the JMX API.  There are no instances of this class.
diff --git a/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java b/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java
index 6551e9ba81b..e236e511976 100644
--- a/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java
+++ b/src/java.management/share/classes/javax/management/MBeanAttributeInfo.java
@@ -26,9 +26,7 @@
 package javax.management;
 
 import java.lang.reflect.Method;
-import java.security.AccessController;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import com.sun.jmx.mbeanserver.Introspector;
 import java.util.Objects;
 
diff --git a/src/java.management/share/classes/javax/management/MBeanInfo.java b/src/java.management/share/classes/javax/management/MBeanInfo.java
index cfb2e6c0ded..df54b4228e2 100644
--- a/src/java.management/share/classes/javax/management/MBeanInfo.java
+++ b/src/java.management/share/classes/javax/management/MBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -34,8 +34,6 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.WeakHashMap;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Objects;
 
 import static javax.management.ImmutableDescriptor.nonNullDescriptor;
@@ -551,10 +549,8 @@ static boolean arrayGettersSafe(Class<?> subclass, Class<?> immutableClass) {
             Boolean safe = arrayGettersSafeMap.get(subclass);
             if (safe == null) {
                 try {
-                    ArrayGettersSafeAction action =
-                        new ArrayGettersSafeAction(subclass, immutableClass);
-                    safe = AccessController.doPrivileged(action);
-                } catch (Exception e) { // e.g. SecurityException
+                    safe = arrayGettersSafeHelper(subclass, immutableClass);
+                } catch (Exception e) {
                     /* We don't know, so we assume it isn't.  */
                     safe = false;
                 }
@@ -564,25 +560,7 @@ static boolean arrayGettersSafe(Class<?> subclass, Class<?> immutableClass) {
         }
     }
 
-    /*
-     * The PrivilegedAction stuff is probably overkill.  We can be
-     * pretty sure the caller does have the required privileges -- a
-     * JMX user that can't do reflection can't even use Standard
-     * MBeans!  But there's probably a performance gain by not having
-     * to check the whole call stack.
-     */
-    private static class ArrayGettersSafeAction
-            implements PrivilegedAction<Boolean> {
-
-        private final Class<?> subclass;
-        private final Class<?> immutableClass;
-
-        ArrayGettersSafeAction(Class<?> subclass, Class<?> immutableClass) {
-            this.subclass = subclass;
-            this.immutableClass = immutableClass;
-        }
-
-        public Boolean run() {
+    private static boolean arrayGettersSafeHelper(Class<?> subclass, Class<?> immutableClass) {
             Method[] methods = immutableClass.getMethods();
             for (int i = 0; i < methods.length; i++) {
                 Method method = methods[i];
@@ -601,7 +579,6 @@ public Boolean run() {
                 }
             }
             return true;
-        }
     }
 
     private static boolean isEqual(String s1, String s2) {
diff --git a/src/java.management/share/classes/javax/management/MBeanServer.java b/src/java.management/share/classes/javax/management/MBeanServer.java
index efecf0def02..036fea93eb7 100644
--- a/src/java.management/share/classes/javax/management/MBeanServer.java
+++ b/src/java.management/share/classes/javax/management/MBeanServer.java
@@ -68,13 +68,6 @@
  * @since 1.5
  */
 
-/* DELETED:
- *
- * <li><p>For the {@link #isRegistered isRegistered} method, the
- * caller's permissions must imply {@link
- * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
- * MBeanPermission(null, null, name, "isRegistered")}.</p>
- */
 public interface MBeanServer extends MBeanServerConnection {
 
     /**
diff --git a/src/java.management/share/classes/javax/management/MBeanServerFactory.java b/src/java.management/share/classes/javax/management/MBeanServerFactory.java
index 21f20e23991..3030d9e2f9a 100644
--- a/src/java.management/share/classes/javax/management/MBeanServerFactory.java
+++ b/src/java.management/share/classes/javax/management/MBeanServerFactory.java
@@ -28,14 +28,9 @@
 import com.sun.jmx.defaults.JmxProperties;
 import static com.sun.jmx.defaults.JmxProperties.JMX_INITIAL_BUILDER;
 import static com.sun.jmx.defaults.JmxProperties.MBEANSERVER_LOGGER;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
-import java.security.AccessController;
-import java.security.Permission;
 import java.util.ArrayList;
 import java.lang.System.Logger.Level;
 import javax.management.loading.ClassLoaderRepository;
-import sun.reflect.misc.ReflectUtil;
-
 
 /**
  * <p>Provides MBean server references.  There are no instances of
@@ -100,38 +95,6 @@ private MBeanServerFactory() {
      **/
     private static MBeanServerBuilder builder = null;
 
-    /**
-     * Provide a new {@link javax.management.MBeanServerBuilder}.
-     * @param builder The new MBeanServerBuilder that will be used to
-     *        create {@link javax.management.MBeanServer}s.
-     * @exception IllegalArgumentException if the given builder is null.
-     *
-     * @exception SecurityException if there is a SecurityManager and
-     * the caller's permissions do not include or imply <code>{@link
-     * MBeanServerPermission}("setMBeanServerBuilder")</code>.
-     *
-     **/
-    // public static synchronized void
-    //    setMBeanServerBuilder(MBeanServerBuilder builder) {
-    //    checkPermission("setMBeanServerBuilder");
-    //    MBeanServerFactory.builder = builder;
-    // }
-
-    /**
-     * Get the current {@link javax.management.MBeanServerBuilder}.
-     *
-     * @return the current {@link javax.management.MBeanServerBuilder}.
-     *
-     * @exception SecurityException if there is a SecurityManager and
-     * the caller's permissions do not include or imply <code>{@link
-     * MBeanServerPermission}("getMBeanServerBuilder")</code>.
-     *
-     **/
-    // public static synchronized MBeanServerBuilder getMBeanServerBuilder() {
-    //     checkPermission("getMBeanServerBuilder");
-    //     return builder;
-    // }
-
     /**
      * Remove internal MBeanServerFactory references to a created
      * MBeanServer. This allows the garbage collector to remove the
@@ -146,8 +109,6 @@ private MBeanServerFactory() {
      *
      */
     public static void releaseMBeanServer(MBeanServer mbeanServer) {
-        checkPermission("releaseMBeanServer");
-
         removeMBeanServer(mbeanServer);
     }
 
@@ -215,8 +176,6 @@ public static MBeanServer createMBeanServer() {
      * MBeanServerBuilder}.
      */
     public static MBeanServer createMBeanServer(String domain)  {
-        checkPermission("createMBeanServer");
-
         final MBeanServer mBeanServer = newMBeanServer(domain);
         addMBeanServer(mBeanServer);
         return mBeanServer;
@@ -290,8 +249,6 @@ public static MBeanServer newMBeanServer() {
      * MBeanServerBuilder}.
      */
     public static MBeanServer newMBeanServer(String domain)  {
-        checkPermission("newMBeanServer");
-
         // Get the builder. Creates a new one if necessary.
         //
         final MBeanServerBuilder mbsBuilder = getNewMBeanServerBuilder();
@@ -335,8 +292,6 @@ public static MBeanServer newMBeanServer(String domain)  {
     public static synchronized
             ArrayList<MBeanServer> findMBeanServer(String agentId) {
 
-        checkPermission("findMBeanServer");
-
         if (agentId == null)
             return new ArrayList<>(mBeanServerList);
 
@@ -379,16 +334,6 @@ private static String mBeanServerId(MBeanServer mbs) {
         }
     }
 
-    private static void checkPermission(String action)
-    throws SecurityException {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            Permission perm = new MBeanServerPermission(action);
-            sm.checkPermission(perm);
-        }
-    }
-
     private static synchronized void addMBeanServer(MBeanServer mbs) {
         mBeanServerList.add(mbs);
     }
@@ -420,7 +365,7 @@ private static Class<?> loadBuilderClass(String builderClassName)
         }
 
         // No context class loader? Try with Class.forName()
-        return ReflectUtil.forName(builderClassName);
+        return Class.forName(builderClassName);
     }
 
     /**
@@ -450,10 +395,7 @@ private static MBeanServerBuilder newBuilder(Class<?> builderClass) {
      **/
     private static synchronized void checkMBeanServerBuilder() {
         try {
-            GetPropertyAction act =
-                    new GetPropertyAction(JMX_INITIAL_BUILDER);
-            @SuppressWarnings("removal")
-            String builderClassName = AccessController.doPrivileged(act);
+            String builderClassName = System.getProperty(JMX_INITIAL_BUILDER);
 
             try {
                 final Class<?> newBuilderClass;
@@ -499,9 +441,6 @@ private static synchronized void checkMBeanServerBuilder() {
      *
      * @return the new current {@link javax.management.MBeanServerBuilder}.
      *
-     * @exception SecurityException if there is a SecurityManager and
-     * the caller's permissions do not make it possible to instantiate
-     * a new builder.
      * @exception JMRuntimeException if the builder instantiation
      *   fails with a checked exception -
      *   {@link java.lang.ClassNotFoundException} etc...
diff --git a/src/java.management/share/classes/javax/management/Notification.java b/src/java.management/share/classes/javax/management/Notification.java
index 337628aeec8..a1db858bda6 100644
--- a/src/java.management/share/classes/javax/management/Notification.java
+++ b/src/java.management/share/classes/javax/management/Notification.java
@@ -31,10 +31,6 @@
 import java.io.ObjectStreamField;
 import java.util.EventObject;
 
-import java.security.AccessController;
-
-import com.sun.jmx.mbeanserver.GetPropertyAction;
-
 /**
  * <p>The Notification class represents a notification emitted by an
  * MBean.  It contains a reference to the source MBean: if the
diff --git a/src/java.management/share/classes/javax/management/NumericValueExp.java b/src/java.management/share/classes/javax/management/NumericValueExp.java
index bae84019d2e..b748bb6e629 100644
--- a/src/java.management/share/classes/javax/management/NumericValueExp.java
+++ b/src/java.management/share/classes/javax/management/NumericValueExp.java
@@ -25,16 +25,11 @@
 
 package javax.management;
 
-
-import com.sun.jmx.mbeanserver.GetPropertyAction;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 
-import java.security.AccessController;
-
 /**
  * This class represents numbers that are arguments to relational constraints.
  * A NumericValueExp may be used anywhere a ValueExp is required.
diff --git a/src/java.management/share/classes/javax/management/ObjectName.java b/src/java.management/share/classes/javax/management/ObjectName.java
index f20750c9d8a..4bcda7f0252 100644
--- a/src/java.management/share/classes/javax/management/ObjectName.java
+++ b/src/java.management/share/classes/javax/management/ObjectName.java
@@ -25,14 +25,12 @@
 
 package javax.management;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import com.sun.jmx.mbeanserver.Util;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
-import java.security.AccessController;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/java.management/share/classes/javax/management/StandardMBean.java b/src/java.management/share/classes/javax/management/StandardMBean.java
index a410ffb3492..cf61ff5a6c6 100644
--- a/src/java.management/share/classes/javax/management/StandardMBean.java
+++ b/src/java.management/share/classes/javax/management/StandardMBean.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
@@ -33,7 +33,6 @@
 import com.sun.jmx.mbeanserver.StandardMBeanSupport;
 import com.sun.jmx.mbeanserver.Util;
 
-import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Map;
@@ -1163,9 +1162,7 @@ static boolean immutableInfo(Class<? extends StandardMBean> subclass) {
             Boolean safe = mbeanInfoSafeMap.get(subclass);
             if (safe == null) {
                 try {
-                    MBeanInfoSafeAction action =
-                        new MBeanInfoSafeAction(subclass);
-                    safe = AccessController.doPrivileged(action);
+                    safe = mBeanInfoSafe(subclass);
                 } catch (Exception e) { // e.g. SecurityException
                     /* We don't know, so we assume it isn't.  */
                     safe = false;
@@ -1189,16 +1186,8 @@ static boolean overrides(Class<?> subclass, Class<?> superclass,
         return false;
     }
 
-    private static class MBeanInfoSafeAction
-            implements PrivilegedAction<Boolean> {
 
-        private final Class<?> subclass;
-
-        MBeanInfoSafeAction(Class<?> subclass) {
-            this.subclass = subclass;
-        }
-
-        public Boolean run() {
+    private static boolean mBeanInfoSafe(Class<?> subclass) {
             // Check for "void cacheMBeanInfo(MBeanInfo)" method.
             //
             if (overrides(subclass, StandardMBean.class,
@@ -1230,6 +1219,5 @@ public Boolean run() {
                               "getNotificationInfo", (Class<?>[]) null))
                     return false;
             return true;
-        }
     }
 }
diff --git a/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java b/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java
index bea7ad92d0c..ebf08d6f1d9 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java
@@ -32,7 +32,6 @@
 
 import static com.sun.jmx.defaults.JmxProperties.MODELMBEAN_LOGGER;
 import static com.sun.jmx.mbeanserver.Util.cast;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import com.sun.jmx.mbeanserver.Util;
 
 import java.io.IOException;
@@ -42,7 +41,6 @@
 
 import java.lang.reflect.Constructor;
 
-import java.security.AccessController;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
@@ -58,8 +56,6 @@
 import javax.management.MBeanException;
 import javax.management.RuntimeOperationsException;
 
-import sun.reflect.misc.ReflectUtil;
-
 /**
  * This class represents the metadata set for a ModelMBean element.  A
  * descriptor is part of the ModelMBeanInfo,
@@ -1140,7 +1136,6 @@ private static Object parseQuotedFieldValue(String s)
 
         final Constructor<?> constr;
         try {
-            ReflectUtil.checkPackageAccess(className);
             final ClassLoader contextClassLoader =
                 Thread.currentThread().getContextClassLoader();
             final Class<?> c =
diff --git a/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java b/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java
index d7d3bed055c..ca94d88c794 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java
@@ -30,13 +30,10 @@
 
 package javax.management.modelmbean;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
-import java.security.AccessController;
 
 /**
  * Exception thrown when an invalid target object type is specified.
diff --git a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java
index d30bd368a63..674b5ccffbd 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java
@@ -31,14 +31,12 @@
 package javax.management.modelmbean;
 
 import static com.sun.jmx.defaults.JmxProperties.MODELMBEAN_LOGGER;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.lang.reflect.Method;
-import java.security.AccessController;
 import java.lang.System.Logger.Level;
 
 import javax.management.Descriptor;
diff --git a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java
index 0b8413083ac..2374b862bf3 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java
@@ -31,14 +31,12 @@
 package javax.management.modelmbean;
 
 import static com.sun.jmx.defaults.JmxProperties.MODELMBEAN_LOGGER;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.lang.reflect.Constructor;
-import java.security.AccessController;
 import java.lang.System.Logger.Level;
 
 import javax.management.Descriptor;
diff --git a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java
index a209c2c7f42..a7d169041a8 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java
@@ -31,13 +31,11 @@
 package javax.management.modelmbean;
 
 import static com.sun.jmx.defaults.JmxProperties.MODELMBEAN_LOGGER;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
-import java.security.AccessController;
 import java.lang.System.Logger.Level;
 
 import javax.management.Descriptor;
diff --git a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java
index c0bce84a5d9..8870217cf60 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java
@@ -31,13 +31,11 @@
 package javax.management.modelmbean;
 
 import static com.sun.jmx.defaults.JmxProperties.MODELMBEAN_LOGGER;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
-import java.security.AccessController;
 import java.lang.System.Logger.Level;
 
 import javax.management.Descriptor;
diff --git a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java
index 4120bc2cd2d..0249d00eeb6 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java
@@ -31,14 +31,12 @@
 package javax.management.modelmbean;
 
 import static com.sun.jmx.defaults.JmxProperties.MODELMBEAN_LOGGER;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.lang.reflect.Method;
-import java.security.AccessController;
 import java.lang.System.Logger.Level;
 
 import javax.management.Descriptor;
diff --git a/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
index d213324f35c..f15a8bee2b3 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,6 @@
 import java.lang.reflect.InvocationTargetException;
 
 import java.lang.reflect.Method;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -78,11 +75,8 @@
 import javax.management.RuntimeOperationsException;
 import javax.management.ServiceNotFoundException;
 import javax.management.loading.ClassLoaderRepository;
-import jdk.internal.access.JavaSecurityAccess;
-import jdk.internal.access.SharedSecrets;
 
 import sun.reflect.misc.MethodUtil;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * This class is the implementation of a ModelMBean. An appropriate
@@ -140,10 +134,6 @@ public class RequiredModelMBean
     private boolean registered = false;
     private transient MBeanServer server = null;
 
-    private static final JavaSecurityAccess javaSecurityAccess = SharedSecrets.getJavaSecurityAccess();
-    @SuppressWarnings("removal")
-    private final AccessControlContext acc = AccessController.getContext();
-
     /*************************************/
     /* constructors                      */
     /*************************************/
@@ -964,32 +954,18 @@ public Object invoke(String opName, Object[] opArgs, String[] sig)
                 }
             }
 
-            final Class<?> targetClass;
+            Class<?> targetClass = null;
 
             if (opClassName != null) {
                 try {
-                    @SuppressWarnings("removal")
-                    AccessControlContext stack = AccessController.getContext();
-                    final Object obj = targetObject;
-                    final String className = opClassName;
                     final ClassNotFoundException[] caughtException = new ClassNotFoundException[1];
 
-                    targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<>() {
-
-                        @Override
-                        public Class<?> run() {
-                            try {
-                                ReflectUtil.checkPackageAccess(className);
-                                final ClassLoader targetClassLoader =
-                                    obj.getClass().getClassLoader();
-                                return Class.forName(className, false,
-                                                            targetClassLoader);
-                            } catch (ClassNotFoundException e) {
-                                caughtException[0] = e;
-                            }
-                            return null;
-                        }
-                    }, stack, acc);
+                    final ClassLoader targetClassLoader = targetObject.getClass().getClassLoader();
+                    try {
+                        targetClass = Class.forName(opClassName, false, targetClassLoader);
+                    } catch (ClassNotFoundException e) {
+                        caughtException[0] = e;
+                    }
 
                     if (caughtException[0] != null) {
                         throw caughtException[0];
@@ -1039,16 +1015,10 @@ private Method resolveMethod(Class<?> targetClass,
         if (sig == null)
             argClasses = null;
         else {
-            @SuppressWarnings("removal")
-            final AccessControlContext stack = AccessController.getContext();
             final ReflectionException[] caughtException = new ReflectionException[1];
             final ClassLoader targetClassLoader = targetClass.getClassLoader();
             argClasses = new Class<?>[sig.length];
 
-            javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
-
-                @Override
-                public Void run() {
                     for (int i = 0; i < sig.length; i++) {
                         if (tracing) {
                             MODELMBEAN_LOGGER.log(Level.TRACE,
@@ -1057,7 +1027,6 @@ public Void run() {
                         argClasses[i] = (Class<?>) primitiveClassMap.get(sig[i]);
                         if (argClasses[i] == null) {
                             try {
-                                ReflectUtil.checkPackageAccess(sig[i]);
                                 argClasses[i] =
                                     Class.forName(sig[i], false, targetClassLoader);
                             } catch (ClassNotFoundException e) {
@@ -1070,9 +1039,6 @@ public Void run() {
                             }
                         }
                     }
-                    return null;
-                }
-            }, stack, acc);
 
             if (caughtException[0] != null) {
                 throw caughtException[0];
@@ -1123,31 +1089,20 @@ private Method findRMMBMethod(String opMethodName,
         if (targetObjectField != null)
             return null;
         final Class<RequiredModelMBean> rmmbClass = RequiredModelMBean.class;
-        final Class<?> targetClass;
+        Class<?> targetClass = null;
         if (opClassName == null)
             targetClass = rmmbClass;
         else {
-            @SuppressWarnings("removal")
-            AccessControlContext stack = AccessController.getContext();
-            final String className = opClassName;
-            targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<>() {
-
-                @Override
-                public Class<?> run() {
-                    try {
-                        ReflectUtil.checkPackageAccess(className);
-                        final ClassLoader targetClassLoader =
-                            rmmbClass.getClassLoader();
-                        Class<?> clz = Class.forName(className, false,
-                                                    targetClassLoader);
-                        if (!rmmbClass.isAssignableFrom(clz))
-                            return null;
-                        return clz;
-                    } catch (ClassNotFoundException e) {
-                        return null;
-                    }
+            final ClassLoader targetClassLoader = rmmbClass.getClassLoader();
+            try {
+                Class<?> clz = Class.forName(opClassName, false, targetClassLoader);
+                if (!rmmbClass.isAssignableFrom(clz)) {
+                    targetClass = null;
+                } else {
+                    targetClass = clz;
                 }
-            }, stack, acc);
+            } catch (ClassNotFoundException e) {
+            }
         }
         try {
             return targetClass != null ? resolveMethod(targetClass, opMethodName, sig) : null;
@@ -1165,21 +1120,12 @@ private Object invokeMethod(String opName, final Method method,
             throws MBeanException, ReflectionException {
         try {
             final Throwable[] caughtException = new Throwable[1];
-            @SuppressWarnings("removal")
-            AccessControlContext stack = AccessController.getContext();
-            Object rslt = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<>() {
-
-                @Override
-                public Object run() {
-                    try {
-                        ReflectUtil.checkPackageAccess(method.getDeclaringClass());
-                        return MethodUtil.invoke(method, targetObject, opArgs);
-                    } catch (InvocationTargetException | IllegalAccessException e) {
-                        caughtException[0] = e;
-                    }
-                    return null;
-                }
-            }, stack, acc);
+            Object rslt = null;
+            try {
+                rslt = MethodUtil.invoke(method, targetObject, opArgs);
+            } catch (InvocationTargetException | IllegalAccessException e) {
+                caughtException[0] = e;
+            }
             if (caughtException[0] != null) {
                 if (caughtException[0] instanceof Exception) {
                     throw (Exception)caughtException[0];
@@ -1577,24 +1523,13 @@ public Object getAttribute(String attrName)
                                 final Class<?> respClass = response.getClass();
                                 final Exception[] caughException = new Exception[1];
 
-                                @SuppressWarnings("removal")
-                                AccessControlContext stack = AccessController.getContext();
-
-                                Class<?> c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<>() {
-
-                                    @Override
-                                    public Class<?> run() {
-                                        try {
-                                            ReflectUtil.checkPackageAccess(respType);
-                                            ClassLoader cl =
-                                                respClass.getClassLoader();
-                                            return Class.forName(respType, true, cl);
-                                        } catch (Exception e) {
-                                            caughException[0] = e;
-                                        }
-                                        return null;
-                                    }
-                                }, stack, acc);
+                                ClassLoader cl = respClass.getClassLoader();
+                                Class<?> c = null;
+                                try {
+                                    c = Class.forName(respType, true, cl);
+                                } catch (Exception e) {
+                                    caughException[0] = e;
+                                }
 
                                 if (caughException[0] != null) {
                                     throw caughException[0];
@@ -2660,31 +2595,20 @@ protected ClassLoaderRepository getClassLoaderRepository() {
 
     private Class<?> loadClass(final String className)
         throws ClassNotFoundException {
-        @SuppressWarnings("removal")
-        AccessControlContext stack = AccessController.getContext();
         final ClassNotFoundException[] caughtException = new ClassNotFoundException[1];
 
-        Class<?> c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<>() {
-
-            @Override
-            public Class<?> run() {
-                try {
-                    ReflectUtil.checkPackageAccess(className);
-                    return Class.forName(className);
-                } catch (ClassNotFoundException e) {
-                    final ClassLoaderRepository clr =
-                        getClassLoaderRepository();
-                    try {
-                        if (clr == null) throw new ClassNotFoundException(className);
-                        return clr.loadClass(className);
-                    } catch (ClassNotFoundException ex) {
-                        caughtException[0] = ex;
-                    }
-                }
-                return null;
+        Class<?> c = null;
+        try {
+            c = Class.forName(className);
+        } catch (ClassNotFoundException e) {
+            final ClassLoaderRepository clr = getClassLoaderRepository();
+            try {
+                if (clr == null) throw new ClassNotFoundException(className);
+                return clr.loadClass(className);
+            } catch (ClassNotFoundException ex) {
+                caughtException[0] = ex;
             }
-        }, stack, acc);
-
+        }
         if (caughtException[0] != null) {
             throw caughtException[0];
         }
diff --git a/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java b/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java
index daa1abf039e..7d4773a49ea 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java
@@ -31,13 +31,10 @@
 
 package javax.management.modelmbean;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
-import java.security.AccessController;
 
 /**
 * This exception is thrown when an XML formatted string is being parsed into ModelMBean objects
diff --git a/src/java.management/share/classes/javax/management/monitor/Monitor.java b/src/java.management/share/classes/javax/management/monitor/Monitor.java
index 151855c3495..6c0b73a41fe 100644
--- a/src/java.management/share/classes/javax/management/monitor/Monitor.java
+++ b/src/java.management/share/classes/javax/management/monitor/Monitor.java
@@ -26,13 +26,9 @@
 package javax.management.monitor;
 
 import static com.sun.jmx.defaults.JmxProperties.MONITOR_LOGGER;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import com.sun.jmx.mbeanserver.Introspector;
 import java.io.IOException;
-import java.security.AccessControlContext;
-import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
@@ -170,15 +166,9 @@ public final synchronized void setDerivedGaugeTimeStamp(
         new CopyOnWriteArrayList<>();
 
     /**
-     * Subject and possibly AccessControlContext of the Monitor.start() caller.
+     * Subject of the Monitor.start() caller.
      */
     private volatile Subject subject;
-    @SuppressWarnings("removal")
-    private static final AccessControlContext noPermissionsACC =
-            new AccessControlContext(
-            new ProtectionDomain[] {new ProtectionDomain(null, null)});
-    @SuppressWarnings("removal")
-    private volatile AccessControlContext acc = noPermissionsACC;
 
     /**
      * Scheduler Service.
@@ -204,9 +194,7 @@ public final synchronized void setDerivedGaugeTimeStamp(
     private static final int maximumPoolSize;
     static {
         final String maximumPoolSizeSysProp = "jmx.x.monitor.maximum.pool.size";
-        @SuppressWarnings("removal")
-        final String maximumPoolSizeStr = AccessController.doPrivileged(
-            new GetPropertyAction(maximumPoolSizeSysProp));
+        final String maximumPoolSizeStr = System.getProperty(maximumPoolSizeSysProp);
         if (maximumPoolSizeStr == null ||
             maximumPoolSizeStr.trim().length() == 0) {
             maximumPoolSize = 10;
@@ -749,10 +737,9 @@ void doStop() {
             //
             cleanupFutures();
 
-            // Reset the Subject and AccessControlContext.
+            // Reset the Subject.
             //
             subject = null;
-            acc = noPermissionsACC;
 
             // Reset the complex type attribute information
             // such that it is recalculated again.
@@ -1469,14 +1456,10 @@ private class MonitorTask implements Runnable {
         public MonitorTask() {
             // Find out if there's already an existing executor for the calling
             // thread and reuse it. Otherwise, create a new one and store it in
-            // the executors map. If there is a SecurityManager, the group of
-            // System.getSecurityManager() is used, else the group of the thread
+            // the executors map.  Use the Thread group of the thread
             // instantiating this MonitorTask, i.e. the group of the thread that
             // calls "Monitor.start()".
-            @SuppressWarnings("removal")
-            SecurityManager s = System.getSecurityManager();
-            ThreadGroup group = (s != null) ? s.getThreadGroup() :
-                Thread.currentThread().getThreadGroup();
+            ThreadGroup group = Thread.currentThread().getThreadGroup();
             synchronized (executorsLock) {
                 for (ThreadPoolExecutor e : executors.keySet()) {
                     DaemonThreadFactory tf =
@@ -1556,8 +1539,7 @@ public Void run() {
      * Daemon thread factory used by the monitor executors.
      * <P>
      * This factory creates all new threads used by an Executor in
-     * the same ThreadGroup. If there is a SecurityManager, it uses
-     * the group of System.getSecurityManager(), else the group of
+     * the same ThreadGroup.  Use the Thread group of
      * the thread instantiating this DaemonThreadFactory. Each new
      * thread is created as a daemon thread with priority
      * Thread.NORM_PRIORITY. New threads have names accessible via
@@ -1572,10 +1554,7 @@ private static class DaemonThreadFactory implements ThreadFactory {
         static final String nameSuffix = "]";
 
         public DaemonThreadFactory(String poolName) {
-            @SuppressWarnings("removal")
-            SecurityManager s = System.getSecurityManager();
-            group = (s != null) ? s.getThreadGroup() :
-                                  Thread.currentThread().getThreadGroup();
+            group = Thread.currentThread().getThreadGroup();
             namePrefix = "JMX Monitor " + poolName + " Pool [Thread-";
         }
 
diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
index c8a6ca2f07a..4f26719d4f3 100644
--- a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
@@ -43,7 +43,6 @@
 import javax.management.ImmutableDescriptor;
 import javax.management.MBeanAttributeInfo;
 import sun.reflect.misc.MethodUtil;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * Describes an attribute of an open MBean.
@@ -693,7 +692,6 @@ private static <T> T convertFromString(String s, OpenType<T> openType) {
         Class<T> c;
         try {
             String className = openType.safeGetClassName();
-            ReflectUtil.checkPackageAccess(className);
             c = cast(Class.forName(className));
         } catch (ClassNotFoundException e) {
             throw new NoClassDefFoundError(e.toString());  // can't happen
@@ -702,8 +700,6 @@ private static <T> T convertFromString(String s, OpenType<T> openType) {
         // Look for: public static T valueOf(String)
         Method valueOf;
         try {
-            // It is safe to call this plain Class.getMethod because the class "c"
-            // was checked before by ReflectUtil.checkPackageAccess(openType.safeGetClassName());
             valueOf = c.getMethod("valueOf", String.class);
             if (!Modifier.isStatic(valueOf.getModifiers()) ||
                     valueOf.getReturnType() != c)
@@ -724,8 +720,6 @@ private static <T> T convertFromString(String s, OpenType<T> openType) {
         // Look for: public T(String)
         Constructor<T> con;
         try {
-            // It is safe to call this plain Class.getConstructor because the class "c"
-            // was checked before by ReflectUtil.checkPackageAccess(openType.safeGetClassName());
             con = c.getConstructor(String.class);
         } catch (NoSuchMethodException e) {
             con = null;
@@ -764,9 +758,6 @@ private static <T> T convertFromStringArray(Object x,
         try {
             String baseClassName = baseType.safeGetClassName();
 
-            // check access to the provided base type class name and bail out early
-            ReflectUtil.checkPackageAccess(baseClassName);
-
             stringArrayClass =
                 Class.forName(squareBrackets + "Ljava.lang.String;");
             targetArrayClass =
diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenType.java b/src/java.management/share/classes/javax/management/openmbean/OpenType.java
index f2a004dab82..a81359a7fe9 100644
--- a/src/java.management/share/classes/javax/management/openmbean/OpenType.java
+++ b/src/java.management/share/classes/javax/management/openmbean/OpenType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,10 @@
 
 package javax.management.openmbean;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -193,14 +190,11 @@ protected OpenType(String  className,
         this.isArray     = isArray;
     }
 
-    @SuppressWarnings("removal")
     private void checkClassNameOverride() throws SecurityException {
         if (this.getClass().getClassLoader() == null)
             return;  // We trust bootstrap classes.
         if (overridesGetClassName(this.getClass())) {
-            final GetPropertyAction getExtendOpenTypes =
-                new GetPropertyAction("jmx.extend.open.types");
-            if (AccessController.doPrivileged(getExtendOpenTypes) == null) {
+            if (System.getProperty("jmx.extend.open.types") == null) {
                 throw new SecurityException("Cannot override getClassName() " +
                         "unless -Djmx.extend.open.types");
             }
@@ -209,16 +203,11 @@ private void checkClassNameOverride() throws SecurityException {
 
     @SuppressWarnings("removal")
     private static boolean overridesGetClassName(final Class<?> c) {
-        return AccessController.doPrivileged(new PrivilegedAction<>() {
-            public Boolean run() {
-                try {
-                    return (c.getMethod("getClassName").getDeclaringClass() !=
-                            OpenType.class);
-                } catch (Exception e) {
-                    return true;  // fail safe
-                }
-            }
-        });
+        try {
+            return (c.getMethod("getClassName").getDeclaringClass() != OpenType.class);
+        } catch (Exception e) {
+            return true;  // fail safe
+        }
     }
 
     private static String validClassName(String className) throws OpenDataException {
diff --git a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
index 00f255f394b..94c804d9029 100644
--- a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
@@ -26,12 +26,10 @@
 
 package javax.management.openmbean;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import com.sun.jmx.mbeanserver.Util;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -148,10 +146,7 @@ public TabularDataSupport(TabularType tabularType, int initialCapacity, float lo
         // Since LinkedHashMap was introduced in SE 1.4, it's conceivable even
         // if very unlikely that we might be the server of a 1.3 client.  In
         // that case you'll need to set this property.  See CR 6334663.
-        @SuppressWarnings("removal")
-        String useHashMapProp = AccessController.doPrivileged(
-                new GetPropertyAction("jmx.tabular.data.hash.map"));
-        boolean useHashMap = "true".equalsIgnoreCase(useHashMapProp);
+        boolean useHashMap = Boolean.getBoolean("jmx.tabular.data.hash.map");
 
         // Construct the empty contents HashMap
         //
diff --git a/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java b/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java
index 7579e416e36..077fce5786e 100644
--- a/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java
+++ b/src/java.management/share/classes/javax/management/relation/MBeanServerNotificationFilter.java
@@ -27,13 +27,11 @@
 
 import static com.sun.jmx.mbeanserver.Util.cast;
 import static com.sun.jmx.defaults.JmxProperties.RELATION_LOGGER;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
-import java.security.AccessController;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/src/java.management/share/classes/javax/management/relation/RelationNotification.java b/src/java.management/share/classes/javax/management/relation/RelationNotification.java
index 16d660bc07f..d1849795eb7 100644
--- a/src/java.management/share/classes/javax/management/relation/RelationNotification.java
+++ b/src/java.management/share/classes/javax/management/relation/RelationNotification.java
@@ -34,8 +34,6 @@
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 
-import java.security.AccessController;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -43,7 +41,6 @@
 import java.util.List;
 import java.util.Set;
 
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 import static com.sun.jmx.mbeanserver.Util.cast;
 
 /**
diff --git a/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java b/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java
index 766c42ca780..e4b221b1d68 100644
--- a/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java
+++ b/src/java.management/share/classes/javax/management/relation/RelationTypeSupport.java
@@ -27,15 +27,12 @@
 
 import static com.sun.jmx.defaults.JmxProperties.RELATION_LOGGER;
 import static com.sun.jmx.mbeanserver.Util.cast;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 
-import java.security.AccessController;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/src/java.management/share/classes/javax/management/relation/Role.java b/src/java.management/share/classes/javax/management/relation/Role.java
index 431092a3b48..7fd90f69b7d 100644
--- a/src/java.management/share/classes/javax/management/relation/Role.java
+++ b/src/java.management/share/classes/javax/management/relation/Role.java
@@ -26,7 +26,6 @@
 package javax.management.relation;
 
 import static com.sun.jmx.mbeanserver.Util.cast;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -34,8 +33,6 @@
 import java.io.ObjectStreamField;
 import java.io.Serializable;
 
-import java.security.AccessController;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/java.management/share/classes/javax/management/relation/RoleInfo.java b/src/java.management/share/classes/javax/management/relation/RoleInfo.java
index 6f2926005e9..9c75cda273f 100644
--- a/src/java.management/share/classes/javax/management/relation/RoleInfo.java
+++ b/src/java.management/share/classes/javax/management/relation/RoleInfo.java
@@ -25,15 +25,11 @@
 
 package javax.management.relation;
 
-
-import com.sun.jmx.mbeanserver.GetPropertyAction;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.io.Serializable;
-import java.security.AccessController;
 
 import javax.management.MBeanServer;
 
diff --git a/src/java.management/share/classes/javax/management/relation/RoleResult.java b/src/java.management/share/classes/javax/management/relation/RoleResult.java
index 7f98a7f7a24..c372f47cd77 100644
--- a/src/java.management/share/classes/javax/management/relation/RoleResult.java
+++ b/src/java.management/share/classes/javax/management/relation/RoleResult.java
@@ -25,17 +25,12 @@
 
 package javax.management.relation;
 
-
-import com.sun.jmx.mbeanserver.GetPropertyAction;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.io.Serializable;
 
-import java.security.AccessController;
-
 /**
  * Represents the result of a multiple access to several roles of a relation
  * (either for reading or writing).
diff --git a/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java b/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java
index 36b6dff9d71..435f68011c2 100644
--- a/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java
+++ b/src/java.management/share/classes/javax/management/relation/RoleUnresolved.java
@@ -26,7 +26,6 @@
 package javax.management.relation;
 
 import static com.sun.jmx.mbeanserver.Util.cast;
-import com.sun.jmx.mbeanserver.GetPropertyAction;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -34,8 +33,6 @@
 import java.io.ObjectStreamField;
 import java.io.Serializable;
 
-import java.security.AccessController;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java
index e5c0907a7b4..459a00f88cf 100644
--- a/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java
+++ b/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, 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
@@ -37,13 +37,9 @@
 import java.util.StringTokenizer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 import com.sun.jmx.remote.util.ClassLogger;
 import com.sun.jmx.remote.util.EnvHelp;
-import sun.reflect.misc.ReflectUtil;
-
 
 /**
  * <p>Factory to create JMX API connector clients.  There
@@ -388,12 +384,7 @@ private static String resolvePkgs(Map<String, ?> env)
             pkgsObject = env.get(PROTOCOL_PROVIDER_PACKAGES);
 
         if (pkgsObject == null)
-            pkgsObject =
-                AccessController.doPrivileged(new PrivilegedAction<String>() {
-                    public String run() {
-                        return System.getProperty(PROTOCOL_PROVIDER_PACKAGES);
-                    }
-                });
+            pkgsObject = System.getProperty(PROTOCOL_PROVIDER_PACKAGES);
 
         if (pkgsObject == null)
             return null;
@@ -447,20 +438,12 @@ static <T> T getProvider(JMXServiceURL serviceURL,
         return instance;
     }
 
-    @SuppressWarnings("removal")
     private static ClassLoader wrap(final ClassLoader parent) {
-        return parent != null ? AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public ClassLoader run() {
-                return new ClassLoader(parent) {
-                    @Override
-                    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-                        ReflectUtil.checkPackageAccess(name);
-                        return super.loadClass(name, resolve);
-                    }
-                };
-            }
-        }) : null;
+        return parent != null ? new ClassLoader(parent) {
+                                    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException
+                                        { return super.loadClass(name, resolve); }
+                                }
+                              : null;
     }
 
     /**
diff --git a/src/java.management/share/classes/sun/management/ClassLoadingImpl.java b/src/java.management/share/classes/sun/management/ClassLoadingImpl.java
index 9c3c62158b7..855b3e97575 100644
--- a/src/java.management/share/classes/sun/management/ClassLoadingImpl.java
+++ b/src/java.management/share/classes/sun/management/ClassLoadingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, 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
@@ -64,8 +64,6 @@ public boolean isVerbose() {
     }
 
     public void setVerbose(boolean value) {
-        Util.checkControlAccess();
-
         setVerboseClass(value);
     }
     static native void setVerboseClass(boolean value);
diff --git a/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java b/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
index 3746cd311b2..a0291045654 100644
--- a/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
+++ b/src/java.management/share/classes/sun/management/ManagementFactoryHelper.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
@@ -36,9 +36,6 @@
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
 import javax.management.RuntimeOperationsException;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 
 import jdk.internal.misc.VM;
 import jdk.internal.misc.VM.BufferPool;
@@ -47,7 +44,6 @@
 import java.util.List;
 
 import java.lang.reflect.UndeclaredThrowableException;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -191,18 +187,13 @@ static boolean isAvailable() {
             return LOG_MANAGER_CLASS != null;
         }
 
-        @SuppressWarnings("removal")
         private static Class<?> loadLoggingClass(String className) {
-            return AccessController.doPrivileged(new PrivilegedAction<>() {
-                @Override
-                public Class<?> run() {
-                    Optional<Module> logging = ModuleLayer.boot().findModule("java.logging");
-                    if (logging.isPresent()) {
-                        return Class.forName(logging.get(), className);
-                    }
-                    return null;
-                }
-            });
+            Optional<Module> logging = ModuleLayer.boot().findModule("java.logging");
+            if (logging.isPresent()) {
+                return Class.forName(logging.get(), className);
+            } else {
+                return null;
+            }
         }
 
         private Map<String, Method> initMethodMap(Object impl) {
@@ -460,29 +451,15 @@ public static synchronized HotspotCompilationMBean getHotspotCompilationMBean()
      * Registers a given MBean if not registered in the MBeanServer;
      * otherwise, just return.
      */
-    @SuppressWarnings("removal")
     private static void addMBean(MBeanServer mbs, Object mbean, String mbeanName) {
+        final ObjectName objName = Util.newObjectName(mbeanName);
+
         try {
-            final ObjectName objName = Util.newObjectName(mbeanName);
-
-            // inner class requires these fields to be final
-            final MBeanServer mbs0 = mbs;
-            final Object mbean0 = mbean;
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-                public Void run() throws MBeanRegistrationException,
-                                         NotCompliantMBeanException {
-                    try {
-                        mbs0.registerMBean(mbean0, objName);
-                        return null;
-                    } catch (InstanceAlreadyExistsException e) {
-                        // if an instance with the object name exists in
-                        // the MBeanServer ignore the exception
-                    }
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw new RuntimeException(e.getException());
+            mbs.registerMBean(mbean, objName);
+        } catch (InstanceAlreadyExistsException iaee) {
+            // if an instance with the object name exists in the MBeanServer, ignore the exception
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -521,26 +498,15 @@ static void registerInternalMBeans(MBeanServer mbs) {
         }
     }
 
-    @SuppressWarnings("removal")
     private static void unregisterMBean(MBeanServer mbs, String mbeanName) {
+        final ObjectName objName = Util.newObjectName(mbeanName);
+
         try {
-            final ObjectName objName = Util.newObjectName(mbeanName);
-
-            // inner class requires these fields to be final
-            final MBeanServer mbs0 = mbs;
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-                public Void run() throws MBeanRegistrationException,
-                                           RuntimeOperationsException  {
-                    try {
-                        mbs0.unregisterMBean(objName);
-                    } catch (InstanceNotFoundException e) {
-                        // ignore exception if not found
-                    }
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw new RuntimeException(e.getException());
+            mbs.unregisterMBean(objName);
+        } catch (InstanceNotFoundException infe) {
+            // ignore exception if not found
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/java.management/share/classes/sun/management/MappedMXBeanType.java b/src/java.management/share/classes/sun/management/MappedMXBeanType.java
index 25ae6321b31..3e83ea35545 100644
--- a/src/java.management/share/classes/sun/management/MappedMXBeanType.java
+++ b/src/java.management/share/classes/sun/management/MappedMXBeanType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -35,10 +35,6 @@
 import java.util.Map;
 import java.util.*;
 import java.io.InvalidObjectException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import javax.management.openmbean.*;
 import static javax.management.openmbean.SimpleType.*;
 
@@ -610,19 +606,14 @@ static class CompositeDataMXBeanType extends MappedMXBeanType {
         Method fromMethod = null;
         Method toMethod = null;
 
-        @SuppressWarnings("removal")
         CompositeDataMXBeanType(Class<?> c) throws OpenDataException {
             this.javaClass = c;
             this.mappedTypeClass = COMPOSITE_DATA_CLASS;
 
             // check if a static from method exists
             try {
-                fromMethod = AccessController.doPrivileged(new PrivilegedExceptionAction<>() {
-                        public Method run() throws NoSuchMethodException {
-                            return javaClass.getMethod("from", COMPOSITE_DATA_CLASS);
-                        }
-                    });
-            } catch (PrivilegedActionException e) {
+                fromMethod = javaClass.getMethod("from", COMPOSITE_DATA_CLASS);
+            } catch (NoSuchMethodException e) {
                 // ignore NoSuchMethodException since we allow classes
                 // that has no from method to be embedded in another class.
             }
@@ -637,12 +628,7 @@ public Method run() throws NoSuchMethodException {
                 this.isCompositeData = false;
 
                 // Make a CompositeData containing all the getters
-                final Method[] methods =
-                    AccessController.doPrivileged(new PrivilegedAction<>() {
-                            public Method[] run() {
-                                return javaClass.getMethods();
-                            }
-                        });
+                final Method[] methods = javaClass.getMethods();
                 final List<String> names = new ArrayList<>();
                 final List<OpenType<?>> types = new ArrayList<>();
 
diff --git a/src/java.management/share/classes/sun/management/MemoryImpl.java b/src/java.management/share/classes/sun/management/MemoryImpl.java
index 5bdbe7b6349..e1f68ce3711 100644
--- a/src/java.management/share/classes/sun/management/MemoryImpl.java
+++ b/src/java.management/share/classes/sun/management/MemoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, 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
@@ -81,8 +81,6 @@ public boolean isVerbose() {
     }
 
     public void setVerbose(boolean value) {
-        Util.checkControlAccess();
-
         setVerboseGC(value);
     }
 
diff --git a/src/java.management/share/classes/sun/management/MemoryPoolImpl.java b/src/java.management/share/classes/sun/management/MemoryPoolImpl.java
index 3b8197bb8f1..defcecf7b21 100644
--- a/src/java.management/share/classes/sun/management/MemoryPoolImpl.java
+++ b/src/java.management/share/classes/sun/management/MemoryPoolImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, 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
@@ -112,8 +112,6 @@ public void setUsageThreshold(long newThreshold) {
                 "Usage threshold is not supported");
         }
 
-        Util.checkControlAccess();
-
         MemoryUsage usage = getUsage0();
         if (newThreshold < 0) {
             throw new IllegalArgumentException(
@@ -157,8 +155,6 @@ public String[] getMemoryManagerNames() {
     }
 
     public void resetPeakUsage() {
-        Util.checkControlAccess();
-
         synchronized (this) {
             // synchronized since getPeakUsage may be called concurrently
             resetPeakUsage0();
@@ -209,8 +205,6 @@ public void setCollectionUsageThreshold(long newThreshold) {
                 "CollectionUsage threshold is not supported");
         }
 
-        Util.checkControlAccess();
-
         MemoryUsage usage = getUsage0();
         if (newThreshold < 0) {
             throw new IllegalArgumentException(
diff --git a/src/java.management/share/classes/sun/management/RuntimeImpl.java b/src/java.management/share/classes/sun/management/RuntimeImpl.java
index c919c0eeddf..a7550650f94 100644
--- a/src/java.management/share/classes/sun/management/RuntimeImpl.java
+++ b/src/java.management/share/classes/sun/management/RuntimeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, 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
@@ -101,7 +101,6 @@ public String getBootClassPath() {
     }
 
     public List<String> getInputArguments() {
-        Util.checkMonitorAccess();
         return jvm.getVmArguments();
     }
 
diff --git a/src/java.management/share/classes/sun/management/ThreadImpl.java b/src/java.management/share/classes/sun/management/ThreadImpl.java
index 1f37b2da567..be54ced066d 100644
--- a/src/java.management/share/classes/sun/management/ThreadImpl.java
+++ b/src/java.management/share/classes/sun/management/ThreadImpl.java
@@ -129,7 +129,6 @@ protected boolean isThreadAllocatedMemoryEnabled() {
 
     @Override
     public long[] getAllThreadIds() {
-        Util.checkMonitorAccess();
         Thread[] threads = getThreads();
         return threadIds(threads);
     }
@@ -178,8 +177,6 @@ public ThreadInfo[] getThreadInfo(long[] ids, int maxDepth) {
         // an empty array of ids should return an empty array of ThreadInfos
         if (ids.length == 0) return new ThreadInfo[0];
 
-        Util.checkMonitorAccess();
-
         ThreadInfo[] infos = new ThreadInfo[ids.length]; // nulls
         if (maxDepth == Integer.MAX_VALUE) {
             getThreadInfo1(ids, -1, infos);
@@ -196,8 +193,6 @@ public void setThreadContentionMonitoringEnabled(boolean enable) {
                 "Thread contention monitoring is not supported");
         }
 
-        Util.checkControlAccess();
-
         synchronized (this) {
             if (contentionMonitoringEnabled != enable) {
                 if (enable) {
@@ -332,7 +327,6 @@ public void setThreadCpuTimeEnabled(boolean enable) {
                 "Thread CPU time measurement is not supported");
         }
 
-        Util.checkControlAccess();
         synchronized (this) {
             if (cpuTimeEnabled != enable) {
                 // notify VM of the state change
@@ -401,7 +395,6 @@ protected long[] getThreadAllocatedBytes(long[] ids) {
     protected void setThreadAllocatedMemoryEnabled(boolean enable) {
         ensureThreadAllocatedMemorySupported();
 
-        Util.checkControlAccess();
         synchronized (this) {
             if (allocatedMemoryEnabled != enable) {
                 // notify VM of the state change
@@ -426,7 +419,6 @@ private long[] threadsToIds(Thread[] threads) {
 
     @Override
     public long[] findMonitorDeadlockedThreads() {
-        Util.checkMonitorAccess();
         Thread[] threads = findMonitorDeadlockedThreads0();
         return threadsToIds(threads);
     }
@@ -438,15 +430,12 @@ public long[] findDeadlockedThreads() {
                 "Monitoring of Synchronizer Usage is not supported.");
         }
 
-        Util.checkMonitorAccess();
-
         Thread[] threads = findDeadlockedThreads0();
         return threadsToIds(threads);
     }
 
     @Override
     public void resetPeakThreadCount() {
-        Util.checkControlAccess();
         resetPeakThreadCount0();
     }
 
@@ -471,8 +460,6 @@ private void verifyDumpThreads(boolean lockedMonitors,
             throw new UnsupportedOperationException(
                 "Monitoring of Synchronizer Usage is not supported.");
         }
-
-        Util.checkMonitorAccess();
     }
 
     @Override
diff --git a/src/java.management/share/classes/sun/management/Util.java b/src/java.management/share/classes/sun/management/Util.java
index e5a25792263..cad5a2e3892 100644
--- a/src/java.management/share/classes/sun/management/Util.java
+++ b/src/java.management/share/classes/sun/management/Util.java
@@ -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.
  * 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,34 +50,15 @@ public static ObjectName newObjectName(String name) {
         }
     }
 
-    private static ManagementPermission monitorPermission =
-        new ManagementPermission("monitor");
-    private static ManagementPermission controlPermission =
-        new ManagementPermission("control");
-
-    /**
-     * Check that the current context is trusted to perform monitoring
-     * or management.
-     * <p>
-     * If the check fails we throw a SecurityException, otherwise
-     * we return normally.
-     *
-     * @exception  SecurityException  if a security manager exists and if
-     *             the caller does not have ManagementPermission("control").
-     */
-    static void checkAccess(ManagementPermission p)
-         throws SecurityException {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(p);
-        }
+    // Methods retained temporarily due to usage by jdk.management.
+    static void checkAccess(ManagementPermission p) {
+        // no-op
     }
 
     static void checkMonitorAccess() throws SecurityException {
-        checkAccess(monitorPermission);
+        // no-op
     }
     public static void checkControlAccess() throws SecurityException {
-        checkAccess(controlPermission);
+        // no-op
     }
 }
diff --git a/src/java.management/share/classes/sun/management/VMManagementImpl.java b/src/java.management/share/classes/sun/management/VMManagementImpl.java
index 4e2fc26c850..041f09547d2 100644
--- a/src/java.management/share/classes/sun/management/VMManagementImpl.java
+++ b/src/java.management/share/classes/sun/management/VMManagementImpl.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
@@ -35,8 +35,6 @@
 import java.util.List;
 import java.util.Arrays;
 import java.util.Collections;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 /**
  * Implementation of VMManagement interface that accesses the management
@@ -202,15 +200,8 @@ public synchronized List<String> getVmArguments() {
     public native int getAvailableProcessors();
 
     // Compilation Subsystem
-    public String   getCompilerName() {
-        @SuppressWarnings("removal")
-        String name =  AccessController.doPrivileged(
-            new PrivilegedAction<>() {
-                public String run() {
-                    return System.getProperty("sun.management.compiler");
-                }
-            });
-        return name;
+    public String getCompilerName() {
+        return System.getProperty("sun.management.compiler");
     }
     public native long getTotalCompileTime();
 
@@ -255,8 +246,7 @@ private synchronized PerfInstrumentation getPerfInstrumentation() {
         }
 
         // construct PerfInstrumentation object
-        @SuppressWarnings("removal")
-        Perf perf =  AccessController.doPrivileged(new Perf.GetPerfAction());
+        Perf perf = Perf.getPerf();
         try {
             ByteBuffer bb = perf.attach(0);
             if (bb.capacity() == 0) {
diff --git a/src/java.naming/share/classes/javax/naming/Context.java b/src/java.naming/share/classes/javax/naming/Context.java
index 292343e70b7..a9baf3e2e46 100644
--- a/src/java.naming/share/classes/javax/naming/Context.java
+++ b/src/java.naming/share/classes/javax/naming/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -1061,27 +1061,4 @@ public Object removeFromEnvironment(String propName)
      * @see #removeFromEnvironment(String)
      */
     String LANGUAGE = "java.naming.language";
-
-    /**
-     * @deprecated An environment property with this name is ignored
-     *             while constructing an initial context.
-     * This constant was originally used as a property name to specify an
-     * {@code Applet} to retrieve parameters from, when creating an initial
-     * context. Currently any applet properties that need to be passed to an
-     * initial context should be copied into the environment hashtable:
-     * <pre>{@code
-     *     Hashtable env = new Hashtable();
-     *     env.put(Context.INITIAL_CONTEXT_FACTORY,
-     *       ((Applet) this).getParameter(Context.INITIAL_CONTEXT_FACTORY));
-     *     env.put(Context.PROVIDER_URL,
-     *       ((Applet) this).getParameter(Context.PROVIDER_URL));
-     *     // ... other properties ...
-     *
-     *     Context ctx = new InitialContext(env);
-     * }</pre>
-     *
-     * @since 1.3
-     */
-    @Deprecated(since = "9", forRemoval = true)
-    String APPLET = "java.naming.applet";
 };
diff --git a/src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java b/src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java
deleted file mode 100644
index f9be382d0fc..00000000000
--- a/src/java.rmi/share/classes/sun/rmi/runtime/NewThreadAction.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.rmi.runtime;
-
-/**
- * A utility class for creating threads. The constructors take a
- * variety of parameters to configure the thread. The run() method
- * creates and sets up the thread and returns it, but does not
- * start it.
- *
- * All constructors allow the choice of the Runnable for the new
- * thread to execute, the name of the new thread (which will be
- * prefixed with "RMI "), and whether or not it will be a daemon
- * thread.
- *
- * The new thread may be created in the system thread group (the root
- * of the thread group tree) or an internally created non-system
- * thread group, as specified at construction of this class.
- *
- * The new thread will have the system class loader as its initial
- * context class loader (that is, its context class loader will NOT be
- * inherited from the current thread).
- *
- * @author      Peter Jones
- **/
-public final class NewThreadAction {
-
-    /** cached reference to the system (root) thread group */
-    static final ThreadGroup systemThreadGroup;
-    static {
-        ThreadGroup group = Thread.currentThread().getThreadGroup();
-        ThreadGroup parent;
-        while ((parent = group.getParent()) != null) {
-            group = parent;
-        }
-        systemThreadGroup = group;
-    }
-
-
-    /**
-     * Special child of the system thread group for running tasks that
-     * may execute user code. The need for a separate thread group may
-     * be a vestige of it having had a different security policy from
-     * the system thread group, so this might no longer be necessary.
-     */
-    static final ThreadGroup userThreadGroup = new ThreadGroup(systemThreadGroup, "RMI Runtime");
-
-    private final ThreadGroup group;
-    private final Runnable runnable;
-    private final String name;
-    private final boolean daemon;
-
-    NewThreadAction(ThreadGroup group, Runnable runnable,
-                    String name, boolean daemon)
-    {
-        this.group = group;
-        this.runnable = runnable;
-        this.name = name;
-        this.daemon = daemon;
-    }
-
-    /**
-     * Creates an action that will create a new thread in the
-     * system thread group.
-     *
-     * @param   runnable the Runnable for the new thread to execute
-     *
-     * @param   name the name of the new thread
-     *
-     * @param   daemon if true, new thread will be a daemon thread;
-     * if false, new thread will not be a daemon thread
-     */
-    public NewThreadAction(Runnable runnable, String name, boolean daemon) {
-        this(systemThreadGroup, runnable, name, daemon);
-    }
-
-    /**
-     * Creates an action that will create a new thread.
-     *
-     * @param   runnable the Runnable for the new thread to execute
-     *
-     * @param   name the name of the new thread
-     *
-     * @param   daemon if true, new thread will be a daemon thread;
-     * if false, new thread will not be a daemon thread
-     *
-     * @param   user if true, thread will be created in a non-system
-     * thread group; if false, thread will be created in the system
-     * thread group
-     */
-    public NewThreadAction(Runnable runnable, String name, boolean daemon,
-                           boolean user)
-    {
-        this(user ? userThreadGroup : systemThreadGroup,
-             runnable, name, daemon);
-    }
-
-    public Thread run() {
-        Thread t = new Thread(group, runnable, "RMI " + name);
-        t.setContextClassLoader(ClassLoader.getSystemClassLoader());
-        t.setDaemon(daemon);
-        return t;
-    }
-}
diff --git a/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java b/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java
index 4be706e57bb..84bd3371408 100644
--- a/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java
+++ b/src/java.rmi/share/classes/sun/rmi/runtime/RuntimeUtil.java
@@ -36,10 +36,46 @@
  * There is a single instance of this class, which can be obtained
  * with a getInstance() call.
  *
+ * This class also contains a couple static methods for creating
+ * threads. The methods allow the choice of the Runnable for the
+ * new thread to execute, the name of the new thread (which will
+ * be prefixed with "RMI "), and whether or not it will be a daemon
+ * thread.
+ *
+ * The new thread may be created in the system thread group (the root
+ * of the thread group tree) or an internally created non-system
+ * thread group (the "user" thread group).
+ *
+ * The new thread will have the system class loader as its initial
+ * context class loader (that is, its context class loader will NOT be
+ * inherited from the current thread).
+ *
  * @author      Peter Jones
  **/
 public final class RuntimeUtil {
 
+    /**
+     * Cached reference to the system (root) thread group.
+     */
+    private static final ThreadGroup systemThreadGroup;
+    static {
+        ThreadGroup group = Thread.currentThread().getThreadGroup();
+        ThreadGroup parent;
+        while ((parent = group.getParent()) != null) {
+            group = parent;
+        }
+        systemThreadGroup = group;
+    }
+
+    /**
+     * Special child of the system thread group for running tasks that
+     * may execute user code. The need for a separate thread group may
+     * be a vestige of it having had a different security policy from
+     * the system thread group, so this might no longer be necessary.
+     */
+    private static final ThreadGroup userThreadGroup =
+        new ThreadGroup(systemThreadGroup, "RMI Runtime");
+
     /** runtime package log */
     private static final Log runtimeLog =
         Log.getLog("sun.rmi.runtime", null, false);
@@ -54,6 +90,14 @@ public final class RuntimeUtil {
     /** thread pool for scheduling delayed tasks */
     private final ScheduledThreadPoolExecutor scheduler;
 
+    /**
+     * Creates the single instance of RuntimeUtil. Note that this is called
+     * from a static initializer, and it has a ThreadFactory that calls
+     * static methods on this class, possibly from other threads. This
+     * should be ok, as the ScheduledThreadPoolExecutor constructor
+     * returns immediately without blocking on the creation of threads
+     * by the factory.
+     */
     private RuntimeUtil() {
         scheduler = new ScheduledThreadPoolExecutor(
             schedulerThreads,
@@ -61,9 +105,10 @@ private RuntimeUtil() {
                 private final AtomicInteger count = new AtomicInteger();
                 public Thread newThread(Runnable runnable) {
                     try {
-                        return new NewThreadAction(runnable,
+                        return newSystemThread(
+                            runnable,
                             "Scheduler(" + count.getAndIncrement() + ")",
-                            true).run();
+                            true);
                     } catch (Throwable t) {
                         runtimeLog.log(Level.WARNING,
                                        "scheduler thread factory throws", t);
@@ -93,4 +138,48 @@ public static RuntimeUtil getInstance() {
     public ScheduledThreadPoolExecutor getScheduler() {
         return scheduler;
     }
+
+    // Thread creation methods.
+
+    /**
+     * Internal method to create a new thread with the given settings.
+     *
+     * @param group the thread group, should be systemThreadGroup or userThreadGroup
+     * @param runnable the thread's task
+     * @param name the thread's name, which will be prefixed with "RMI "
+     * @param daemon whether the thread should be a daemon
+     * @return the newly created thread
+     */
+    private static Thread newThread(ThreadGroup group, Runnable runnable, String name, boolean daemon) {
+        Thread t = new Thread(group, runnable, "RMI " + name);
+        t.setContextClassLoader(ClassLoader.getSystemClassLoader());
+        t.setDaemon(daemon);
+        return t;
+    }
+
+    /**
+     * Creates and returns, but does not start, a new thread with the given settings.
+     * The thread will be in the system ("root") thread group.
+     *
+     * @param runnable the thread's task
+     * @param name the thread's name, which will be prefixed with "RMI "
+     * @param daemon whether the thread should be a daemon
+     * @return the newly created thread
+     */
+    public static Thread newSystemThread(Runnable runnable, String name, boolean daemon) {
+        return newThread(systemThreadGroup, runnable, name, daemon);
+    }
+
+    /**
+     * Creates and returns, but does not start, a new thread with the given settings.
+     * The thread will be in the RMI user thread group.
+     *
+     * @param runnable the thread's task
+     * @param name the thread's name, which will be prefixed with "RMI "
+     * @param daemon whether the thread should be a daemon
+     * @return the newly created thread
+     */
+    public static Thread newUserThread(Runnable runnable, String name, boolean daemon) {
+        return newThread(userThreadGroup, runnable, name, daemon);
+    }
 }
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java b/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java
index 6bf0248f529..2fe59ccad66 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/DGCClient.java
@@ -41,7 +41,7 @@
 import java.rmi.server.ObjID;
 
 import sun.rmi.runtime.Log;
-import sun.rmi.runtime.NewThreadAction;
+import sun.rmi.runtime.RuntimeUtil;
 import sun.rmi.server.UnicastRef;
 import sun.rmi.server.Util;
 
@@ -237,8 +237,7 @@ private EndpointEntry(final Endpoint endpoint) {
                 throw new Error("internal error creating DGC stub");
             }
             renewCleanThread =
-                new NewThreadAction(new RenewCleanThread(),
-                                    "RenewClean-" + endpoint, true).run();
+                RuntimeUtil.newSystemThread(new RenewCleanThread(), "RenewClean-" + endpoint, true);
             renewCleanThread.start();
         }
 
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java b/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java
index dd1fcaddeab..ab79714f4a2 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/ObjectTable.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import sun.rmi.runtime.Log;
-import sun.rmi.runtime.NewThreadAction;
+import sun.rmi.runtime.RuntimeUtil;
 
 /**
  * Object table shared by all implementors of the Transport interface.
@@ -271,7 +271,7 @@ static void incrementKeepAliveCount() {
             keepAliveCount++;
 
             if (reaper == null) {
-                reaper = new NewThreadAction(new Reaper(), "Reaper", false).run();
+                reaper = RuntimeUtil.newSystemThread(new Reaper(), "Reaper", false);
                 reaper.start();
             }
 
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/Target.java b/src/java.rmi/share/classes/sun/rmi/transport/Target.java
index 3ea404698f2..0729d40b129 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/Target.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/Target.java
@@ -31,7 +31,7 @@
 import java.rmi.server.Unreferenced;
 import java.util.*;
 import sun.rmi.runtime.Log;
-import sun.rmi.runtime.NewThreadAction;
+import sun.rmi.runtime.RuntimeUtil;
 import sun.rmi.server.Dispatcher;
 
 /**
@@ -312,10 +312,10 @@ private synchronized void refSetRemove(VMID vmid) {
              */
             Remote obj = getImpl();
             if (obj instanceof Unreferenced unrefObj) {
-                new NewThreadAction(() -> {
+                RuntimeUtil.newUserThread(() -> {
                     Thread.currentThread().setContextClassLoader(ccl);
                     unrefObj.unreferenced();
-                }, "Unreferenced-" + nextThreadNum++, false, true).run().start();
+                }, "Unreferenced-" + nextThreadNum++, false).start();
                 // REMIND: access to nextThreadNum not synchronized; you care?
             }
 
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java
index 91ef41d3e49..9099a167d5d 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java
@@ -37,7 +37,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import sun.rmi.runtime.Log;
-import sun.rmi.runtime.NewThreadAction;
 import sun.rmi.runtime.RuntimeUtil;
 import sun.rmi.transport.Channel;
 import sun.rmi.transport.Connection;
@@ -401,9 +400,9 @@ public ConnectionAcceptor(TCPTransport transport) {
      * Start a new thread to accept connections.
      */
     public void startNewAcceptor() {
-        Thread t = new NewThreadAction(ConnectionAcceptor.this,
-                                       "TCPChannel Accept-" + ++ threadNum,
-                                       true).run();
+        Thread t = RuntimeUtil.newSystemThread(ConnectionAcceptor.this,
+                                               "TCPChannel Accept-" + ++ threadNum,
+                                               true);
         t.start();
     }
 
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
index 4eb1a35a95e..b0bfa03e130 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
@@ -45,7 +45,7 @@
 import java.util.Map;
 import java.util.Set;
 import sun.rmi.runtime.Log;
-import sun.rmi.runtime.NewThreadAction;
+import sun.rmi.runtime.RuntimeUtil;
 import sun.rmi.transport.Channel;
 import sun.rmi.transport.Endpoint;
 import sun.rmi.transport.Target;
@@ -752,7 +752,7 @@ static String attemptFQDN(InetAddress localAddr)
         private void getFQDN() {
 
             /* FQDN finder will run in RMI threadgroup. */
-            Thread t = new NewThreadAction(FQDN.this, "FQDN Finder", true).run();
+            Thread t = RuntimeUtil.newSystemThread(FQDN.this, "FQDN Finder", true);
             t.start();
         }
 
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
index 9695fcac274..1a4a00f072d 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
@@ -60,7 +60,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import sun.rmi.runtime.Log;
-import sun.rmi.runtime.NewThreadAction;
+import sun.rmi.runtime.RuntimeUtil;
 import sun.rmi.transport.Connection;
 import sun.rmi.transport.DGCAckHandler;
 import sun.rmi.transport.Endpoint;
@@ -98,8 +98,7 @@ public class TCPTransport extends Transport {
             new SynchronousQueue<Runnable>(),
             new ThreadFactory() {
                 public Thread newThread(Runnable runnable) {
-                    return new NewThreadAction(
-                        runnable, "TCP Connection(idle)", true, true).run();
+                    return RuntimeUtil.newUserThread(runnable, "TCP Connection(idle)", true);
                 }
             });
 
@@ -303,8 +302,8 @@ private void listen() throws RemoteException {
                  * "port in use" will cause export to hang if an
                  * RMIFailureHandler is not installed.
                  */
-                Thread t = new NewThreadAction(new AcceptLoop(server),
-                                        "TCP Accept-" + port, true).run();
+                Thread t = RuntimeUtil.newSystemThread(
+                    new AcceptLoop(server), "TCP Accept-" + port, true);
                 t.start();
             } catch (java.net.BindException e) {
                 throw new ExportException("Port already in use: " + port, e);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 62c12334629..62f7c15a95f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -4728,7 +4728,7 @@ else if (ownOuter.hasTag(CLASS) && site != ownOuter) {
                 chk.checkDeprecated(tree.pos(), env.info.scope.owner, sym);
                 chk.checkSunAPI(tree.pos(), sym);
                 chk.checkProfile(tree.pos(), sym);
-                chk.checkPreview(tree.pos(), env.info.scope.owner, sym);
+                chk.checkPreview(tree.pos(), env.info.scope.owner, site, sym);
             }
 
             if (pt.isErroneous()) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index 5a442bac302..3f675cad651 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1845,7 +1845,8 @@ void checkOverride(JCTree tree,
         }
 
         if (shouldCheckPreview(m, other, origin)) {
-            checkPreview(tree.pos(), m, other);
+            checkPreview(TreeInfo.diagnosticPositionFor(m, tree),
+                         m, origin.type, other);
         }
 
         Type mt = types.memberType(origin.type, m);
@@ -1925,7 +1926,8 @@ else if (unhandledUnerased.nonEmpty()) {
         private boolean shouldCheckPreview(MethodSymbol m, MethodSymbol other, ClassSymbol origin) {
             if (m.owner != origin ||
                 //performance - only do the expensive checks when the overridden method is a Preview API:
-                (other.flags() & PREVIEW_API) == 0) {
+                ((other.flags() & PREVIEW_API) == 0 &&
+                 (other.owner.flags() & PREVIEW_API) == 0)) {
                 return false;
             }
 
@@ -3828,8 +3830,29 @@ void checkProfile(final DiagnosticPosition pos, final Symbol s) {
     }
 
     void checkPreview(DiagnosticPosition pos, Symbol other, Symbol s) {
-        if ((s.flags() & PREVIEW_API) != 0 && !preview.participatesInPreview(syms, other, s) && !disablePreviewCheck) {
-            if ((s.flags() & PREVIEW_REFLECTIVE) == 0) {
+        checkPreview(pos, other, Type.noType, s);
+    }
+
+    void checkPreview(DiagnosticPosition pos, Symbol other, Type site, Symbol s) {
+        boolean sIsPreview;
+        Symbol previewSymbol;
+        if ((s.flags() & PREVIEW_API) != 0) {
+            sIsPreview = true;
+            previewSymbol=  s;
+        } else if ((s.kind == Kind.MTH || s.kind == Kind.VAR) &&
+                   site.tsym != null &&
+                   (site.tsym.flags() & PREVIEW_API) == 0 &&
+                   (s.owner.flags() & PREVIEW_API) != 0) {
+            //calling a method, or using a field, whose owner is a preview, but
+            //using a site that is not a preview. Also produce an error or warning:
+            sIsPreview = true;
+            previewSymbol = s.owner;
+        } else {
+            sIsPreview = false;
+            previewSymbol = null;
+        }
+        if (sIsPreview && !preview.participatesInPreview(syms, other, s) && !disablePreviewCheck) {
+            if ((previewSymbol.flags() & PREVIEW_REFLECTIVE) == 0) {
                 if (!preview.isEnabled()) {
                     log.error(pos, Errors.IsPreview(s));
                 } else {
@@ -4083,6 +4106,29 @@ public void visitReturn(JCReturn tree) {
         public void visitClassDef(JCClassDecl tree) {
             // don't descend any further
         }
+
+        @Override
+        public void visitLambda(JCLambda tree) {
+            final boolean constructorPrev = constructor;
+            final boolean firstStatementPrev = firstStatement;
+            final JCReturn earlyReturnPrev = earlyReturn;
+            final Name initCallPrev = initCall;
+            final int scanDepthPrev = scanDepth;
+            constructor = false;
+            firstStatement = false;
+            earlyReturn = null;
+            initCall = null;
+            scanDepth = 0;
+            try {
+                super.visitLambda(tree);
+            } finally {
+                constructor = constructorPrev;
+                firstStatement = firstStatementPrev;
+                earlyReturn = earlyReturnPrev;
+                initCall = initCallPrev;
+                scanDepth = scanDepthPrev;
+            }
+        }
     }
 
 /* *************************************************************************
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
index e7ce967065b..5cc6c69096c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, 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
@@ -54,14 +54,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.zip.ZipException;
 
@@ -327,7 +325,7 @@ synchronized Container getContainer(Path path) throws IOException {
             } else {
                 try {
                     fs = new ArchiveContainer(path);
-                } catch (ProviderNotFoundException | SecurityException ex) {
+                } catch (ProviderNotFoundException ex) {
                     throw new IOException(ex);
                 }
             }
@@ -556,7 +554,7 @@ private final class ArchiveContainer implements Container {
         private final FileSystem fileSystem;
         private final Map<RelativeDirectory, Path> packages;
 
-        public ArchiveContainer(Path archivePath) throws IOException, ProviderNotFoundException, SecurityException {
+        public ArchiveContainer(Path archivePath) throws IOException, ProviderNotFoundException {
             this.archivePath = archivePath;
             if (multiReleaseValue != null && archivePath.toString().endsWith(".jar")) {
                 Map<String,String> env = Collections.singletonMap("multi-release", multiReleaseValue);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index d70032353b6..a24184e990b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -1760,12 +1760,6 @@ int adjustFlags(final long flags) {
     }
 
     long getLastModified(FileObject filename) {
-        long mod = 0;
-        try {
-            mod = filename.getLastModified();
-        } catch (SecurityException e) {
-            throw new AssertionError("CRT: couldn't get source file modification date: " + e.getMessage());
-        }
-        return mod;
+        return filename.getLastModified();
     }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
index 8a8226b3dba..fe972f267df 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
@@ -39,7 +39,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.List;
 
 import jdk.internal.misc.MethodFinder;
 import jdk.internal.misc.VM;
@@ -74,7 +73,6 @@ public final class SourceLauncher {
     public static void main(String... args) throws Throwable {
         try {
             new SourceLauncher(System.err)
-                    .checkSecurityManager()
                     .run(VM.getRuntimeArguments(), args);
         } catch (Fault f) {
             System.err.println(f.getMessage());
@@ -108,19 +106,6 @@ public SourceLauncher(PrintWriter out) {
         this.out = out;
     }
 
-    /**
-     * Checks if a security manager is present and throws an exception if so.
-     * @return this object
-     * @throws Fault if a security manager is present
-     */
-    @SuppressWarnings("removal")
-    private SourceLauncher checkSecurityManager() throws Fault {
-        if (System.getSecurityManager() != null) {
-            throw new Fault(Errors.SecurityManager);
-        }
-        return this;
-    }
-
     /**
      * Compiles a source file, and executes the main method it contains.
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 9600e4f6e4f..274ac029b92 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -97,6 +97,7 @@
 import static com.sun.tools.javac.code.TypeTag.CLASS;
 import static com.sun.tools.javac.main.Option.*;
 import com.sun.tools.javac.tree.JCTree.JCBindingPattern;
+import com.sun.tools.javac.tree.JCTree.JCInstanceOf;
 import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
 
 import static javax.tools.StandardLocation.CLASS_OUTPUT;
@@ -1550,6 +1551,13 @@ public void visitBindingPattern(JCBindingPattern tree) {
                 super.visitBindingPattern(tree);
             }
             @Override
+            public void visitTypeTest(JCInstanceOf tree) {
+                if (tree.pattern.type.isPrimitive()) {
+                    hasPatterns = true;
+                }
+                super.visitTypeTest(tree);
+            }
+            @Override
             public void visitRecordPattern(JCRecordPattern that) {
                 hasPatterns = true;
                 super.visitRecordPattern(that);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index 1870d487c59..4ea1c488875 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, 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,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.file.Path;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Predicate;
@@ -62,7 +59,6 @@
 import com.sun.tools.javac.comp.Enter;
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.comp.Modules;
-import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.model.JavacElements;
@@ -167,7 +163,6 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
 
     private ClassLoader processorClassLoader;
     private ServiceLoader<Processor> serviceLoader;
-    private SecurityException processorLoaderException;
 
     private final JavaFileManager fileManager;
 
@@ -268,28 +263,24 @@ private Set<String> initPlatformAnnotations() {
     }
 
     private void initProcessorLoader() {
-        try {
-            if (fileManager.hasLocation(ANNOTATION_PROCESSOR_MODULE_PATH)) {
-                try {
-                    serviceLoader = fileManager.getServiceLoader(ANNOTATION_PROCESSOR_MODULE_PATH, Processor.class);
-                } catch (IOException e) {
-                    throw new Abort(e);
-                }
-            } else {
-                // If processorpath is not explicitly set, use the classpath.
-                processorClassLoader = fileManager.hasLocation(ANNOTATION_PROCESSOR_PATH)
-                    ? fileManager.getClassLoader(ANNOTATION_PROCESSOR_PATH)
-                    : fileManager.getClassLoader(CLASS_PATH);
+        if (fileManager.hasLocation(ANNOTATION_PROCESSOR_MODULE_PATH)) {
+            try {
+                serviceLoader = fileManager.getServiceLoader(ANNOTATION_PROCESSOR_MODULE_PATH, Processor.class);
+            } catch (IOException e) {
+                throw new Abort(e);
+            }
+        } else {
+            // If processorpath is not explicitly set, use the classpath.
+            processorClassLoader = fileManager.hasLocation(ANNOTATION_PROCESSOR_PATH)
+                ? fileManager.getClassLoader(ANNOTATION_PROCESSOR_PATH)
+                : fileManager.getClassLoader(CLASS_PATH);
 
-                if (options.isSet("accessInternalAPI"))
-                    ModuleHelper.addExports(getClass().getModule(), processorClassLoader.getUnnamedModule());
+            if (options.isSet("accessInternalAPI"))
+                ModuleHelper.addExports(getClass().getModule(), processorClassLoader.getUnnamedModule());
 
-                if (processorClassLoader != null && processorClassLoader instanceof Closeable closeable) {
-                    compiler.closeables = compiler.closeables.prepend(closeable);
-                }
+            if (processorClassLoader != null && processorClassLoader instanceof Closeable closeable) {
+                compiler.closeables = compiler.closeables.prepend(closeable);
             }
-        } catch (SecurityException e) {
-            processorLoaderException = e;
         }
     }
 
@@ -305,35 +296,24 @@ private void initProcessorIterator(Iterable<? extends Processor> processors) {
         } else if (processors != null) {
             processorIterator = processors.iterator();
         } else {
-            if (processorLoaderException == null) {
-                /*
-                 * If the "-processor" option is used, search the appropriate
-                 * path for the named class.  Otherwise, use a service
-                 * provider mechanism to create the processor iterator.
-                 *
-                 * Note: if an explicit processor path is not set,
-                 * only the class path and _not_ the module path are
-                 * searched for processors.
-                 */
-                String processorNames = options.get(Option.PROCESSOR);
-                if (fileManager.hasLocation(ANNOTATION_PROCESSOR_MODULE_PATH)) {
-                    processorIterator = (processorNames == null) ?
-                            new ServiceIterator(serviceLoader, log) :
-                            new NameServiceIterator(serviceLoader, log, processorNames);
-                } else if (processorNames != null) {
-                    processorIterator = new NameProcessIterator(processorNames, processorClassLoader, log);
-                } else {
-                    processorIterator = new ServiceIterator(processorClassLoader, log);
-                }
+            /*
+             * If the "-processor" option is used, search the appropriate
+             * path for the named class.  Otherwise, use a service
+             * provider mechanism to create the processor iterator.
+             *
+             * Note: if an explicit processor path is not set,
+             * only the class path and _not_ the module path are
+             * searched for processors.
+             */
+            String processorNames = options.get(Option.PROCESSOR);
+            if (fileManager.hasLocation(ANNOTATION_PROCESSOR_MODULE_PATH)) {
+                processorIterator = (processorNames == null) ?
+                        new ServiceIterator(serviceLoader, log) :
+                        new NameServiceIterator(serviceLoader, log, processorNames);
+            } else if (processorNames != null) {
+                processorIterator = new NameProcessIterator(processorNames, processorClassLoader, log);
             } else {
-                /*
-                 * A security exception will occur if we can't create a classloader.
-                 * Ignore the exception if, with hindsight, we didn't need it anyway
-                 * (i.e. no processor was specified either explicitly, or implicitly,
-                 * in service configuration file.) Otherwise, we cannot continue.
-                 */
-                processorIterator = handleServiceLoaderUnavailability("proc.cant.create.loader",
-                        processorLoaderException);
+                processorIterator = new ServiceIterator(processorClassLoader, log);
             }
         }
         PlatformDescription platformProvider = context.get(PlatformDescription.class);
@@ -363,47 +343,6 @@ public <S> ServiceLoader<S> getServiceLoader(Class<S> service) {
         }
     }
 
-    /**
-     * Returns an empty processor iterator if no processors are on the
-     * relevant path, otherwise if processors are present, logs an
-     * error.  Called when a service loader is unavailable for some
-     * reason, either because a service loader class cannot be found
-     * or because a security policy prevents class loaders from being
-     * created.
-     *
-     * @param key The resource key to use to log an error message
-     * @param e   If non-null, pass this exception to Abort
-     */
-    private Iterator<Processor> handleServiceLoaderUnavailability(String key, Exception e) {
-        if (fileManager instanceof JavacFileManager standardFileManager) {
-            Iterable<? extends Path> workingPath = fileManager.hasLocation(ANNOTATION_PROCESSOR_PATH)
-                ? standardFileManager.getLocationAsPaths(ANNOTATION_PROCESSOR_PATH)
-                : standardFileManager.getLocationAsPaths(CLASS_PATH);
-
-            if (needClassLoader(options.get(Option.PROCESSOR), workingPath) )
-                handleException(key, e);
-
-        } else {
-            handleException(key, e);
-        }
-
-        return Collections.emptyIterator();
-    }
-
-    /**
-     * Handle a security exception thrown during initializing the
-     * Processor iterator.
-     */
-    private void handleException(String key, Exception e) {
-        if (e != null) {
-            log.error(key, e.getLocalizedMessage());
-            throw new Abort(e);
-        } else {
-            log.error(key);
-            throw new Abort();
-        }
-    }
-
     /**
      * Use a service loader appropriate for the platform to provide an
      * iterator over annotations processors; fails if a loader is
@@ -417,13 +356,8 @@ private class ServiceIterator implements Iterator<Processor> {
         ServiceIterator(ClassLoader classLoader, Log log) {
             this.log = log;
             try {
-                try {
-                    loader = ServiceLoader.load(Processor.class, classLoader);
-                    this.iterator = loader.iterator();
-                } catch (Exception e) {
-                    // Fail softly if a loader is not actually needed.
-                    this.iterator = handleServiceLoaderUnavailability("proc.no.service", null);
-                }
+                loader = ServiceLoader.load(Processor.class, classLoader);
+                this.iterator = loader.iterator();
             } catch (Throwable t) {
                 log.error(Errors.ProcServiceProblem);
                 throw new Abort(t);
@@ -1548,32 +1482,6 @@ private boolean isModuleInfo(JavaFileObject fo, JavaFileObject.Kind kind) {
         return fo.isNameCompatible("module-info", kind);
     }
 
-    /*
-     * Called retroactively to determine if a class loader was required,
-     * after we have failed to create one.
-     */
-    private boolean needClassLoader(String procNames, Iterable<? extends Path> workingpath) {
-        if (procNames != null)
-            return true;
-
-        URL[] urls = new URL[1];
-        for(Path pathElement : workingpath) {
-            try {
-                urls[0] = pathElement.toUri().toURL();
-                if (ServiceProxy.hasService(Processor.class, urls))
-                    return true;
-            } catch (MalformedURLException ex) {
-                throw new AssertionError(ex);
-            }
-            catch (ServiceProxy.ServiceConfigurationError e) {
-                log.error(Errors.ProcBadConfigFile(e.getLocalizedMessage()));
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     class ImplicitCompleter implements Completer {
 
         private final JCCompilationUnit topLevel;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
deleted file mode 100644
index 20324629ef4..00000000000
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.javac.processing;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/**
- * Utility class to determine if a service can be found on the
- * path that might be used to create a class loader.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- */
-// based on sun.misc.Service
-class ServiceProxy {
-    static class ServiceConfigurationError extends Error {
-        static final long serialVersionUID = 7732091036771098303L;
-
-        ServiceConfigurationError(String msg) {
-            super(msg);
-        }
-    }
-
-    private static final String prefix = "META-INF/services/";
-
-    private static void fail(Class<?> service, String msg)
-            throws ServiceConfigurationError {
-        throw new ServiceConfigurationError(service.getName() + ": " + msg);
-    }
-
-    private static void fail(Class<?> service, URL u, int line, String msg)
-            throws ServiceConfigurationError {
-        fail(service, u + ":" + line + ": " + msg);
-    }
-
-    /**
-     * Parse the content of the given URL as a provider-configuration file.
-     *
-     * @param  service
-     *         The service class for which providers are being sought;
-     *         used to construct error detail strings
-     *
-     * @param  u
-     *         The URL naming the configuration file to be parsed
-     *
-     * @return true if the name of a service is found
-     *
-     * @throws ServiceConfigurationError
-     *         If an I/O error occurs while reading from the given URL, or
-     *         if a configuration-file format error is detected
-     */
-    private static boolean parse(Class<?> service, URL u) throws ServiceConfigurationError {
-        InputStream in = null;
-        BufferedReader r = null;
-        try {
-            in = u.openStream();
-            r = new BufferedReader(new InputStreamReader(in, UTF_8));
-            int lc = 1;
-            String ln;
-            while ((ln = r.readLine()) != null) {
-                int ci = ln.indexOf('#');
-                if (ci >= 0) ln = ln.substring(0, ci);
-                ln = ln.trim();
-                int n = ln.length();
-                if (n != 0) {
-                    if ((ln.indexOf(' ') >= 0) || (ln.indexOf('\t') >= 0))
-                        fail(service, u, lc, "Illegal configuration-file syntax");
-                    int cp = ln.codePointAt(0);
-                    if (!Character.isJavaIdentifierStart(cp))
-                        fail(service, u, lc, "Illegal provider-class name: " + ln);
-                    for (int i = Character.charCount(cp); i < n; i += Character.charCount(cp)) {
-                        cp = ln.codePointAt(i);
-                        if (!Character.isJavaIdentifierPart(cp) && (cp != '.'))
-                            fail(service, u, lc, "Illegal provider-class name: " + ln);
-                    }
-                    return true;
-                }
-            }
-        } catch (FileNotFoundException x) {
-            return false;
-        } catch (IOException x) {
-            fail(service, ": " + x);
-        } finally {
-            try {
-                if (r != null) r.close();
-            } catch (IOException y) {
-                fail(service, ": " + y);
-            }
-            try {
-                if (in != null) in.close();
-            } catch (IOException y) {
-                fail(service, ": " + y);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Return true if a description for at least one service is found in the
-     * service configuration files in the given URLs.
-     */
-    public static boolean hasService(Class<?> service, URL[] urls)
-            throws ServiceConfigurationError {
-        for (URL url: urls) {
-            try {
-                String fullName = prefix + service.getName();
-                @SuppressWarnings("deprecation")
-                URL u = new URL(url, fullName);
-                boolean found = parse(service, u);
-                if (found)
-                    return true;
-            } catch (MalformedURLException e) {
-                // should not happen; ignore it if it does
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index bd666f3427d..96944f698dd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1179,9 +1179,6 @@ compiler.misc.user.selected.completion.failure=\
 compiler.err.proc.no.explicit.annotation.processing.requested=\
     Class names, ''{0}'', are only accepted if annotation processing is explicitly requested
 
-compiler.err.proc.no.service=\
-    A ServiceLoader was not usable and is required for annotation processing.
-
 # 0: string, 1: string
 compiler.err.proc.processor.bad.option.name=\
     Bad option name ''{0}'' provided by processor ''{1}''
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
index 1bf209a7fd6..dddad794427 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
@@ -84,9 +84,6 @@ launcher.error=\
 launcher.err.no.args=\
     no path for source file
 
-launcher.err.security.manager=\
-    cannot use source-code launcher with a security manager enabled
-
 # 0: string
 launcher.err.invalid.filename=\
     invalid path for source file: {0}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
index 84cf7e38d1f..0efd1d94ca1 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
@@ -55,7 +55,7 @@ public class JavaThread extends Thread {
   private static CIntegerField stackSizeField;
   private static CIntegerField terminatedField;
   private static AddressField activeHandlesField;
-  private static CIntegerField lockIdField;
+  private static CIntegerField monitorOwnerIDField;
   private static long oopPtrSize;
 
   private static JavaThreadPDAccess access;
@@ -102,7 +102,7 @@ private static synchronized void initialize(TypeDataBase db) {
     stackSizeField    = type.getCIntegerField("_stack_size");
     terminatedField   = type.getCIntegerField("_terminated");
     activeHandlesField = type.getAddressField("_active_handles");
-    lockIdField        = type.getCIntegerField("_lock_id");
+    monitorOwnerIDField = type.getCIntegerField("_monitor_owner_id");
 
     lockStackTopOffset = type.getField("_lock_stack").getOffset() + typeLockStack.getField("_top").getOffset();
     lockStackBaseOffset = type.getField("_lock_stack").getOffset() + typeLockStack.getField("_base[0]").getOffset();
@@ -378,8 +378,8 @@ public String getThreadName() {
     return OopUtilities.threadOopGetName(threadObj);
   }
 
-  public Address getLockId() {
-    return lockIdField.getAddress(addr);
+  public Address getMonitorOwnerID() {
+    return monitorOwnerIDField.getAddress(addr);
   }
 
   //
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
index e8eacbe756f..e2e0c989425 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
@@ -213,7 +213,7 @@ private JavaThread owningThreadFromMonitor(Address o) {
         if (o == null) return null;
         for (int i = 0; i < getNumberOfThreads(); i++) {
             JavaThread thread = getJavaThreadAt(i);
-            if (o.equals(thread.getLockId())) {
+            if (o.equals(thread.getMonitorOwnerID())) {
                 return thread;
             }
         }
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
index e86f1944cd3..d025e90cf87 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
@@ -31,8 +31,6 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.InetSocketAddress;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Iterator;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
@@ -83,12 +81,7 @@ public abstract HttpsServer createHttpsServer(InetSocketAddress addr,
     /**
      * Initializes a new instance of this class.
      */
-    protected HttpServerProvider() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkPermission(new RuntimePermission("httpServerProvider"));
-    }
+    protected HttpServerProvider() {}
 
     private static boolean loadProviderFromProperty() {
         String cn = System.getProperty("com.sun.net.httpserver.HttpServerProvider");
@@ -107,8 +100,7 @@ private static boolean loadProviderFromProperty() {
                  NoSuchMethodException |
                  ClassNotFoundException |
                  IllegalAccessException |
-                 InstantiationException |
-                 SecurityException x) {
+                 InstantiationException x) {
             throw new ServiceConfigurationError(null, x);
         }
     }
@@ -118,20 +110,10 @@ private static boolean loadProviderAsService() {
             ServiceLoader.load(HttpServerProvider.class,
                                ClassLoader.getSystemClassLoader())
                 .iterator();
-        for (;;) {
-            try {
-                if (!i.hasNext())
-                    return false;
-                provider = i.next();
-                return true;
-            } catch (ServiceConfigurationError sce) {
-                if (sce.getCause() instanceof SecurityException) {
-                    // Ignore the security exception, try the next provider
-                    continue;
-                }
-                throw sce;
-            }
-        }
+        if (!i.hasNext())
+            return false;
+        provider = i.next();
+        return true;
     }
 
     /**
@@ -170,22 +152,16 @@ private static boolean loadProviderAsService() {
      *
      * @return  The system-wide default HttpServerProvider
      */
-    @SuppressWarnings("removal")
     public static HttpServerProvider provider () {
         synchronized (lock) {
             if (provider != null)
                 return provider;
-            return (HttpServerProvider)AccessController
-                .doPrivileged(new PrivilegedAction<Object>() {
-                        public Object run() {
-                            if (loadProviderFromProperty())
-                                return provider;
-                            if (loadProviderAsService())
-                                return provider;
-                            provider = new sun.net.httpserver.DefaultHttpServerProvider();
-                            return provider;
-                        }
-                    });
+            if (loadProviderFromProperty())
+                return provider;
+            if (loadProviderAsService())
+                return provider;
+            provider = new sun.net.httpserver.DefaultHttpServerProvider();
+            return provider;
         }
     }
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
index d56ae8aa94d..a6f03fdc542 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 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
@@ -27,12 +27,6 @@
 
 import com.sun.net.httpserver.*;
 import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.util.*;
-import javax.security.auth.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.login.*;
 
 public class AuthFilter extends Filter {
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java
index e6e0ad85759..dd09957c0c6 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -27,14 +27,9 @@
 
 import java.net.*;
 import java.io.*;
-import java.nio.*;
-import java.security.*;
-import java.nio.channels.*;
-import java.util.*;
 import java.util.concurrent.*;
-import javax.net.ssl.*;
+
 import com.sun.net.httpserver.*;
-import com.sun.net.httpserver.spi.*;
 
 public class HttpServerImpl extends HttpServer {
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java
index f6b94db7c0e..97312ec29e6 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -27,14 +27,9 @@
 
 import java.net.*;
 import java.io.*;
-import java.nio.*;
-import java.security.*;
-import java.nio.channels.*;
-import java.util.*;
 import java.util.concurrent.*;
-import javax.net.ssl.*;
+
 import com.sun.net.httpserver.*;
-import com.sun.net.httpserver.spi.*;
 
 public class HttpsServerImpl extends HttpsServer {
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java
index 9186dd4c168..3eda0eb1a48 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java
@@ -27,14 +27,11 @@
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.security.PrivilegedAction;
 
 /**
  * Parameters that users will not likely need to set
  * but are useful for debugging
  */
-
-@SuppressWarnings("removal")
 class ServerConfig {
 
     private static final int DEFAULT_IDLE_TIMER_SCHEDULE_MILLIS = 10000 ; // 10 sec.
@@ -52,94 +49,73 @@ class ServerConfig {
     private static final int  DEFAULT_MAX_REQ_HEADER_SIZE = 380 * 1024;
     private static final long DEFAULT_DRAIN_AMOUNT = 64 * 1024;
 
-    private static long idleTimerScheduleMillis;
-    private static long idleIntervalMillis;
+    private static final long idleTimerScheduleMillis;
+    private static final long idleIntervalMillis;
     // The maximum number of bytes to drain from an inputstream
-    private static long drainAmount;
+    private static final long drainAmount;
     // the maximum number of connections that the server will allow to be open
     // after which it will no longer "accept()" any new connections, till the
     // current connection count goes down due to completion of processing the requests
-    private static int maxConnections;
-    private static int maxIdleConnections;
+    private static final int maxConnections;
+    private static final int maxIdleConnections;
     // The maximum number of request headers allowable
-    private static int maxReqHeaders;
+    private static final int maxReqHeaders;
     // a maximum value for the header list size. This is the
     // names size + values size + 32 bytes per field line
-    private static int maxReqHeadersSize;
+    private static final int maxReqHeadersSize;
     // max time a request or response is allowed to take
-    private static long maxReqTime;
-    private static long maxRspTime;
-    private static long reqRspTimerScheduleMillis;
-    private static boolean debug;
+    private static final long maxReqTime;
+    private static final long maxRspTime;
+    private static final long reqRspTimerScheduleMillis;
+    private static final boolean debug;
 
     // the value of the TCP_NODELAY socket-level option
-    private static boolean noDelay;
+    private static final boolean noDelay;
 
     static {
-        java.security.AccessController.doPrivileged(
-            new PrivilegedAction<Void>() {
-                @Override
-                public Void run () {
-                    idleIntervalMillis = Long.getLong("sun.net.httpserver.idleInterval",
-                            DEFAULT_IDLE_INTERVAL_IN_SECS) * 1000;
-                    if (idleIntervalMillis <= 0) {
-                        idleIntervalMillis = DEFAULT_IDLE_INTERVAL_IN_SECS * 1000;
-                    }
-
-                    idleTimerScheduleMillis = Long.getLong("sun.net.httpserver.clockTick",
-                            DEFAULT_IDLE_TIMER_SCHEDULE_MILLIS);
-                    if (idleTimerScheduleMillis <= 0) {
-                        // ignore zero or negative value and use the default schedule
-                        idleTimerScheduleMillis = DEFAULT_IDLE_TIMER_SCHEDULE_MILLIS;
-                    }
-
-                    maxConnections = Integer.getInteger(
-                            "jdk.httpserver.maxConnections",
-                            DEFAULT_MAX_CONNECTIONS);
-
-                    maxIdleConnections = Integer.getInteger(
-                            "sun.net.httpserver.maxIdleConnections",
-                            DEFAULT_MAX_IDLE_CONNECTIONS);
-
-                    drainAmount = Long.getLong("sun.net.httpserver.drainAmount",
-                            DEFAULT_DRAIN_AMOUNT);
-
-                    maxReqHeaders = Integer.getInteger(
-                            "sun.net.httpserver.maxReqHeaders",
-                            DEFAULT_MAX_REQ_HEADERS);
-                    if (maxReqHeaders <= 0) {
-                        maxReqHeaders = DEFAULT_MAX_REQ_HEADERS;
-                    }
-
-                    // a value <= 0 means unlimited
-                    maxReqHeadersSize = Integer.getInteger(
-                            "sun.net.httpserver.maxReqHeaderSize",
-                            DEFAULT_MAX_REQ_HEADER_SIZE);
-                    if (maxReqHeadersSize <= 0) {
-                        maxReqHeadersSize = 0;
-                    }
-
-                    maxReqTime = Long.getLong("sun.net.httpserver.maxReqTime",
-                            DEFAULT_MAX_REQ_TIME);
-
-                    maxRspTime = Long.getLong("sun.net.httpserver.maxRspTime",
-                            DEFAULT_MAX_RSP_TIME);
-
-                    reqRspTimerScheduleMillis = Long.getLong("sun.net.httpserver.timerMillis",
-                            DEFAULT_REQ_RSP_TIMER_TASK_SCHEDULE_MILLIS);
-                    if (reqRspTimerScheduleMillis <= 0) {
-                        // ignore any negative or zero value for this configuration and reset
-                        // to default schedule
-                        reqRspTimerScheduleMillis = DEFAULT_REQ_RSP_TIMER_TASK_SCHEDULE_MILLIS;
-                    }
-
-                    debug = Boolean.getBoolean("sun.net.httpserver.debug");
-
-                    noDelay = Boolean.getBoolean("sun.net.httpserver.nodelay");
-
-                    return null;
-                }
-            });
+
+        long providedIdleIntervalMillis =
+                Long.getLong("sun.net.httpserver.idleInterval", DEFAULT_IDLE_INTERVAL_IN_SECS) * 1000;
+        idleIntervalMillis = providedIdleIntervalMillis > 0
+                ? providedIdleIntervalMillis
+                : Math.multiplyExact(DEFAULT_IDLE_INTERVAL_IN_SECS, 1000);
+
+        long providedIdleTimerScheduleMillis =
+                Long.getLong("sun.net.httpserver.clockTick", DEFAULT_IDLE_TIMER_SCHEDULE_MILLIS);
+        // Ignore zero or negative value and use the default schedule
+        idleTimerScheduleMillis = providedIdleTimerScheduleMillis > 0
+                ? providedIdleTimerScheduleMillis
+                : DEFAULT_IDLE_TIMER_SCHEDULE_MILLIS;
+
+        maxConnections = Integer.getInteger("jdk.httpserver.maxConnections", DEFAULT_MAX_CONNECTIONS);
+
+        maxIdleConnections = Integer.getInteger("sun.net.httpserver.maxIdleConnections", DEFAULT_MAX_IDLE_CONNECTIONS);
+
+        drainAmount = Long.getLong("sun.net.httpserver.drainAmount", DEFAULT_DRAIN_AMOUNT);
+
+        int providedMaxReqHeaders = Integer.getInteger("sun.net.httpserver.maxReqHeaders", DEFAULT_MAX_REQ_HEADERS);
+        maxReqHeaders = providedMaxReqHeaders > 0 ? providedMaxReqHeaders : DEFAULT_MAX_REQ_HEADERS;
+
+        // A value <= 0 means unlimited
+        maxReqHeadersSize = Math.max(
+                Integer.getInteger("sun.net.httpserver.maxReqHeaderSize", DEFAULT_MAX_REQ_HEADER_SIZE),
+                0);
+
+        maxReqTime = Long.getLong("sun.net.httpserver.maxReqTime", DEFAULT_MAX_REQ_TIME);
+
+        maxRspTime = Long.getLong("sun.net.httpserver.maxRspTime", DEFAULT_MAX_RSP_TIME);
+
+        long providedReqRspTimerScheduleMillis = Long.getLong(
+                "sun.net.httpserver.timerMillis",
+                DEFAULT_REQ_RSP_TIMER_TASK_SCHEDULE_MILLIS);
+        // Ignore any negative or zero value for this configuration and reset to default schedule
+        reqRspTimerScheduleMillis = providedReqRspTimerScheduleMillis > 0
+                ? providedReqRspTimerScheduleMillis
+                : DEFAULT_REQ_RSP_TIMER_TASK_SCHEDULE_MILLIS;
+
+        debug = Boolean.getBoolean("sun.net.httpserver.debug");
+
+        noDelay = Boolean.getBoolean("sun.net.httpserver.nodelay");
 
     }
 
@@ -148,39 +124,22 @@ static void checkLegacyProperties(final Logger logger) {
         // legacy properties that are no longer used
         // print a warning to logger if they are set.
 
-        java.security.AccessController.doPrivileged(
-            new PrivilegedAction<Void>() {
-                public Void run () {
-                    if (System.getProperty("sun.net.httpserver.readTimeout")
-                                                !=null)
-                    {
-                        logger.log (Level.WARNING,
-                            "sun.net.httpserver.readTimeout "+
-                            "property is no longer used. "+
-                            "Use sun.net.httpserver.maxReqTime instead."
-                        );
-                    }
-                    if (System.getProperty("sun.net.httpserver.writeTimeout")
-                                                !=null)
-                    {
-                        logger.log (Level.WARNING,
-                            "sun.net.httpserver.writeTimeout "+
-                            "property is no longer used. Use "+
-                            "sun.net.httpserver.maxRspTime instead."
-                        );
-                    }
-                    if (System.getProperty("sun.net.httpserver.selCacheTimeout")
-                                                !=null)
-                    {
-                        logger.log (Level.WARNING,
-                            "sun.net.httpserver.selCacheTimeout "+
-                            "property is no longer used."
-                        );
-                    }
-                    return null;
-                }
-            }
-        );
+        if (System.getProperty("sun.net.httpserver.readTimeout") != null) {
+            logger.log(
+                    Level.WARNING,
+                    "sun.net.httpserver.readTimeout property is no longer used. " +
+                            "Use sun.net.httpserver.maxReqTime instead.");
+        }
+        if (System.getProperty("sun.net.httpserver.writeTimeout") != null) {
+            logger.log(
+                    Level.WARNING,
+                    "sun.net.httpserver.writeTimeout property is no longer used. " +
+                            "Use sun.net.httpserver.maxRspTime instead.");
+        }
+        if (System.getProperty("sun.net.httpserver.selCacheTimeout") != null) {
+            logger.log(Level.WARNING, "sun.net.httpserver.selCacheTimeout property is no longer used.");
+        }
+
     }
 
     static boolean debugEnabled() {
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 49377475719..cb27911c647 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
@@ -53,8 +53,6 @@
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -304,16 +302,8 @@ public synchronized void removeContext (HttpContext context) throws IllegalArgum
         logger.log (Level.DEBUG, "context removed: " + context.getPath());
     }
 
-    @SuppressWarnings("removal")
     public InetSocketAddress getAddress() {
-        return AccessController.doPrivileged(
-                new PrivilegedAction<InetSocketAddress>() {
-                    public InetSocketAddress run() {
-                        return
-                            (InetSocketAddress)schan.socket()
-                                .getLocalSocketAddress();
-                    }
-                });
+        return (InetSocketAddress) schan.socket().getLocalSocketAddress();
     }
 
     void addEvent (Event r) {
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 81ddb58eecf..6e2683737e6 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
@@ -25,7 +25,6 @@
 
 package sun.net.httpserver.simpleserver;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -67,12 +66,6 @@ public final class FileServerHandler implements HttpHandler {
 
     private FileServerHandler(Path root, UnaryOperator<String> mimeTable) {
         root = root.normalize();
-
-        @SuppressWarnings("removal")
-        var securityManager = System.getSecurityManager();
-        if (securityManager != null)
-            securityManager.checkRead(pathForSecurityCheck(root.toString()));
-
         if (!Files.exists(root))
             throw new IllegalArgumentException("Path does not exist: " + root);
         if (!root.isAbsolute())
@@ -86,11 +79,6 @@ private FileServerHandler(Path root, UnaryOperator<String> mimeTable) {
         this.logger = System.getLogger("com.sun.net.httpserver");
     }
 
-    private static String pathForSecurityCheck(String path) {
-        var separator = String.valueOf(File.separatorChar);
-        return path.endsWith(separator) ? (path + "-") : (path + separator + "-");
-    }
-
     private static final HttpHandler NOT_IMPLEMENTED_HANDLER =
             HttpHandlers.of(501, Headers.of(), "");
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java
index baa35a76883..a7daa46bdff 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.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
@@ -26,8 +26,6 @@
 package sun.net.httpserver.simpleserver;
 
 import java.io.PrintWriter;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -84,15 +82,9 @@ private static void setMaxReqTime() {
         }
     }
 
-    @SuppressWarnings("removal")
     static void setMaxConnectionsIfNotSet() {
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            if (System.getProperty(SYS_PROP_MAX_CONNECTIONS) != null) {
-                // an explicit value has already been set, so we don't override it
-                return null;
-            }
+        if (System.getProperty(SYS_PROP_MAX_CONNECTIONS) == null) {
             System.setProperty(SYS_PROP_MAX_CONNECTIONS, DEFAULT_JWEBSERVER_MAX_CONNECTIONS);
-            return null;
-        });
+        }
     }
 }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorIntrinsics.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorIntrinsics.java
index c0e70ca58e6..266a843083a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorIntrinsics.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorIntrinsics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, 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
@@ -26,14 +26,11 @@
 
 import jdk.internal.vm.annotation.ForceInline;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Objects;
 
 /*non-public*/ class VectorIntrinsics {
-    @SuppressWarnings("removal")
-    static final int VECTOR_ACCESS_OOB_CHECK = AccessController.doPrivileged((PrivilegedAction<Integer>) () ->
-            Integer.getInteger("jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK", 2));
+    static final int VECTOR_ACCESS_OOB_CHECK =
+            Integer.getInteger("jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK", 2);
 
     @ForceInline
     static void requireLength(int haveLength, int length) {
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
index 056671d7841..3c128c6b6b3 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,12 +28,8 @@
 import jdk.internal.perf.Perf;
 import sun.jvmstat.monitor.*;
 import sun.jvmstat.perfdata.monitor.*;
-import java.util.*;
 import java.io.*;
 import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.lang.reflect.Constructor;
-import java.security.AccessController;
 
 /**
  * The concrete PerfDataBuffer implementation for the <em>local:</em>
@@ -45,11 +41,8 @@
  * @author Brian Doherty
  * @since 1.5
  */
-// Suppreess unchecked conversion warning at line 34.
-//@SuppressWarnings("unchecked")
 public class PerfDataBuffer extends AbstractPerfDataBuffer {
-    @SuppressWarnings("removal")
-    private static final Perf perf = AccessController.doPrivileged(new Perf.GetPerfAction());
+    private static final Perf perf = Perf.getPerf();
 
     /**
      * Create a PerfDataBuffer instance for accessing the specified
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c
index 25d076889f0..3ff27b89d63 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c
@@ -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
@@ -30,7 +30,7 @@
 
 
 static jclass jlM(JNIEnv *env) {
-    return findClass(env, "Ljava/lang/Module;");
+    return findClass(env, "java/lang/Module");
 }
 
 static jboolean
@@ -50,6 +50,11 @@ getName(PacketInputStream *in, PacketOutputStream *out)
         return JNI_TRUE;
     }
     namestr = (jstring)JNI_FUNC_PTR(env, CallObjectMethod) (env, module, method);
+    if (JNI_FUNC_PTR(env,ExceptionCheck)(env)) {
+        JNI_FUNC_PTR(env,ExceptionClear)(env); // keep -Xcheck:jni happy
+        ERROR_MESSAGE(("JNI Exception occurred calling Module.getName()"));
+        EXIT_ERROR(AGENT_ERROR_JNI_EXCEPTION, NULL);
+    }
     if (namestr != NULL) {
         name = (char*)JNI_FUNC_PTR(env, GetStringUTFChars)(env, namestr, NULL);
     } else {
@@ -78,6 +83,11 @@ getClassLoader(PacketInputStream *in, PacketOutputStream *out)
         return JNI_TRUE;
     }
     loader = JNI_FUNC_PTR(env, CallObjectMethod) (env, module, method);
+    if (JNI_FUNC_PTR(env,ExceptionCheck)(env)) {
+        JNI_FUNC_PTR(env,ExceptionClear)(env); // keep -Xcheck:jni happy
+        ERROR_MESSAGE(("JNI Exception occurred calling ClassLoader.getClassLoader()"));
+        EXIT_ERROR(AGENT_ERROR_JNI_EXCEPTION, NULL);
+    }
 
     (void)outStream_writeObjectRef(env, out, loader);
     return JNI_TRUE;
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
index e4a9bd79943..3968b1de6b6 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
@@ -681,23 +681,14 @@ event_callback(JNIEnv *env, EventInfo *evinfo)
         bagDestroyBag(eventBag);
     }
 
-    /* Always restore any exception that was set beforehand.  If
-     * there is a pending async exception, StopThread will be
-     * called from threadControl_onEventHandlerExit immediately
-     * below.  Depending on VM implementation and state, the async
-     * exception might immediately overwrite the currentException,
-     * or it might be delayed until later.  */
-    if (currentException != NULL) {
-        JNI_FUNC_PTR(env,Throw)(env, currentException);
-    } else {
-        JNI_FUNC_PTR(env,ExceptionClear)(env);
-    }
+    /* Clear any exception thrown while handling the event. */
+    JNI_FUNC_PTR(env,ExceptionClear)(env);
 
     /*
      * Release thread resources and perform any delayed operations.
      */
     if (thread != NULL) {
-        threadControl_onEventHandlerExit(evinfo->ei, thread, eventBag);
+        threadControl_onEventHandlerExit(evinfo->ei, thread, eventBag, currentException);
     }
 }
 
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
index 4b32430ad7b..1dcb73500d7 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
@@ -338,6 +338,22 @@ invoker_requestInvoke(jbyte invokeType, jbyte options, jint id,
     return error;
 }
 
+static void
+saveGlobalRefHelper(JNIEnv *env, jobject obj, jobject *pobj)
+{
+    // In order to keep -Xcheck:jni happy, we have to clear any pending
+    // exception before calling saveGlobalRef(). We also need to restore
+    // it for the caller of this function.
+    jthrowable exception = JNI_FUNC_PTR(env,ExceptionOccurred)(env);
+    if (exception != NULL) {
+        JNI_FUNC_PTR(env,ExceptionClear)(env);
+    }
+    saveGlobalRef(env, obj, pobj);
+    if (exception != NULL) {
+        JNI_FUNC_PTR(env,Throw)(env, exception);
+    }
+}
+
 static void
 invokeConstructor(JNIEnv *env, InvokeRequest *request)
 {
@@ -349,7 +365,7 @@ invokeConstructor(JNIEnv *env, InvokeRequest *request)
                                      request->arguments);
     request->returnValue.l = NULL;
     if (object != NULL) {
-        saveGlobalRef(env, object, &(request->returnValue.l));
+        saveGlobalRefHelper(env, object, &(request->returnValue.l));
     }
 }
 
@@ -367,7 +383,7 @@ invokeStatic(JNIEnv *env, InvokeRequest *request)
                                    request->arguments);
         request->returnValue.l = NULL;
         if (object != NULL) {
-            saveGlobalRef(env, object, &(request->returnValue.l));
+            saveGlobalRefHelper(env, object, &(request->returnValue.l));
         }
         return;
     }
@@ -455,7 +471,7 @@ invokeVirtual(JNIEnv *env, InvokeRequest *request)
                              request->arguments);
         request->returnValue.l = NULL;
         if (object != NULL) {
-            saveGlobalRef(env, object, &(request->returnValue.l));
+            saveGlobalRefHelper(env, object, &(request->returnValue.l));
         }
         return;
     }
@@ -545,7 +561,7 @@ invokeNonvirtual(JNIEnv *env, InvokeRequest *request)
                                        request->arguments);
         request->returnValue.l = NULL;
         if (object != NULL) {
-            saveGlobalRef(env, object, &(request->returnValue.l));
+            saveGlobalRefHelper(env, object, &(request->returnValue.l));
         }
         return;
     }
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
index 7e68e65e56c..4b037142d52 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -2141,7 +2141,7 @@ doPendingTasks(JNIEnv *env, jthread thread, int pendingInterrupt, jobject pendin
 
 void
 threadControl_onEventHandlerExit(EventIndex ei, jthread thread,
-                                 struct bag *eventBag)
+                                 struct bag *eventBag, jobject currentException)
 {
     ThreadNode *node;
     JNIEnv *env = getEnv();
@@ -2178,6 +2178,17 @@ threadControl_onEventHandlerExit(EventIndex ei, jthread thread,
         // locks when doing that. Thus we got all our node updates done first
         // and can now exit the threadLock.
         debugMonitorExit(threadLock);
+        if (currentException != NULL) {
+            // We need to rethrow the exception that was current when we received the
+            // JVMTI event. If there is a pending async exception, StopThread will be
+            // called from doPendingTasks() immediately below. Depending on the VM
+            // implementation and state, the async exception might immediately overwrite
+            // the currentException, or it might be delayed until later.
+            //
+            // Note in order the keep the JNI Checker happy, we had to delay doing this
+            // until now. Otherwise there are complaints when JNI IsVirtualThread is called.
+            JNI_FUNC_PTR(env,Throw)(env, currentException);
+        }
         doPendingTasks(env, thread, pendingInterrupt, pendingStop);
         if (pendingStop != NULL) {
           tossGlobalRef(env, &pendingStop);
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h
index b7817d35981..f3e921948f4 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, 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
@@ -41,8 +41,7 @@ void threadControl_onDisconnect(void);
 jvmtiError threadControl_popFrames(jthread thread, FrameNumber fnum);
 
 struct bag *threadControl_onEventHandlerEntry(jbyte sessionID, EventInfo *evinfo, jobject currentException);
-void threadControl_onEventHandlerExit(EventIndex ei, jthread thread, struct bag *);
-
+void threadControl_onEventHandlerExit(EventIndex ei, jthread thread, struct bag *, jobject currentException);
 
 jvmtiError threadControl_suspendThread(jthread thread, jboolean deferred);
 jvmtiError threadControl_resumeThread(jthread thread, jboolean do_unblock);
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.c b/src/jdk.jdwp.agent/share/native/libjdwp/util.c
index a79545ed274..45de2ba7b7a 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/util.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.c
@@ -101,13 +101,10 @@ findClass(JNIEnv *env, const char * name)
         EXIT_ERROR(AGENT_ERROR_ILLEGAL_ARGUMENT,"findClass name");
     }
     x = JNI_FUNC_PTR(env,FindClass)(env, name);
-    if (x == NULL) {
-        ERROR_MESSAGE(("JDWP Can't find class %s", name));
-        EXIT_ERROR(AGENT_ERROR_NULL_POINTER,NULL);
-    }
     if ( JNI_FUNC_PTR(env,ExceptionCheck)(env) ) {
-        ERROR_MESSAGE(("JDWP Exception occurred finding class %s", name));
-        EXIT_ERROR(AGENT_ERROR_NULL_POINTER,NULL);
+        JNI_FUNC_PTR(env,ExceptionClear)(env); // keep -Xcheck:jni happy
+        ERROR_MESSAGE(("JNI Exception occurred finding class %s", name));
+        EXIT_ERROR(AGENT_ERROR_JNI_EXCEPTION,NULL);
     }
     return x;
 }
@@ -130,15 +127,11 @@ getMethod(JNIEnv *env, jclass clazz, const char * name, const char *signature)
         EXIT_ERROR(AGENT_ERROR_ILLEGAL_ARGUMENT,"getMethod signature");
     }
     method = JNI_FUNC_PTR(env,GetMethodID)(env, clazz, name, signature);
-    if (method == NULL) {
-        ERROR_MESSAGE(("JDWP Can't find method %s with signature %s",
-                                name, signature));
-        EXIT_ERROR(AGENT_ERROR_NULL_POINTER,NULL);
-    }
     if ( JNI_FUNC_PTR(env,ExceptionCheck)(env) ) {
-        ERROR_MESSAGE(("JDWP Exception occurred finding method %s with signature %s",
-                                name, signature));
-        EXIT_ERROR(AGENT_ERROR_NULL_POINTER,NULL);
+        JNI_FUNC_PTR(env,ExceptionClear)(env); // keep -Xcheck:jni happy
+        ERROR_MESSAGE(("JNI Exception occurred finding method %s with signature %s",
+                       name, signature));
+        EXIT_ERROR(AGENT_ERROR_JNI_EXCEPTION,NULL);
     }
     return method;
 }
@@ -161,15 +154,11 @@ getStaticMethod(JNIEnv *env, jclass clazz, const char * name, const char *signat
         EXIT_ERROR(AGENT_ERROR_ILLEGAL_ARGUMENT,"getStaticMethod signature");
     }
     method = JNI_FUNC_PTR(env,GetStaticMethodID)(env, clazz, name, signature);
-    if (method == NULL) {
-        ERROR_MESSAGE(("JDWP Can't find method %s with signature %s",
-                                name, signature));
-        EXIT_ERROR(AGENT_ERROR_NULL_POINTER,NULL);
-    }
     if ( JNI_FUNC_PTR(env,ExceptionCheck)(env) ) {
+        JNI_FUNC_PTR(env,ExceptionClear)(env); // keep -Xcheck:jni happy
         ERROR_MESSAGE(("JDWP Exception occurred finding method %s with signature %s",
-                                name, signature));
-        EXIT_ERROR(AGENT_ERROR_NULL_POINTER,NULL);
+                       name, signature));
+        EXIT_ERROR(AGENT_ERROR_JNI_EXCEPTION,NULL);
     }
     return method;
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
index a027d756508..c51c3afe331 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
@@ -35,7 +35,7 @@
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 
 /**
  * Helper class when working with bytecode.
diff --git a/src/jdk.jpackage/share/man/jpackage.md b/src/jdk.jpackage/share/man/jpackage.md
index 9d7a3003c24..faaae6acfbb 100644
--- a/src/jdk.jpackage/share/man/jpackage.md
+++ b/src/jdk.jpackage/share/man/jpackage.md
@@ -661,6 +661,12 @@ jpackage will lookup files by specific names in the resource directory.
 
 :   WiX project file for installer UI
 
+`wix-conv.xsl`
+
+:   WiX source code converter. Used for converting WiX sources from WiX v3 to v4 schema when WiX v4 or newer is used
+
+    Default resource is *wix3-to-wix4-conv.xsl*
+
 
 #### Resource directory files considered only when building Windows EXE installer:
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
index f724e08fc89..1c96b5885e7 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
@@ -333,14 +333,7 @@ public boolean validate(Map<String, ? super Object> params)
 
             FileAssociation.verify(FileAssociation.fetchFrom(params));
 
-            var serviceInstallerResource = initServiceInstallerResource(params);
-            if (serviceInstallerResource != null) {
-                if (!Files.exists(serviceInstallerResource.getExternalPath())) {
-                    throw new ConfigException(I18N.getString(
-                            "error.missing-service-installer"), I18N.getString(
-                                    "error.missing-service-installer.advice"));
-                }
-            }
+            initServiceInstallerResource(params);
 
             return true;
         } catch (RuntimeException re) {
@@ -407,11 +400,15 @@ private void prepareProto(Map<String, ? super Object> params)
             ensureByMutationFileIsRTF(destFile);
         }
 
-        var serviceInstallerResource = initServiceInstallerResource(params);
-        if (serviceInstallerResource != null) {
-            var serviceInstallerPath = serviceInstallerResource.getExternalPath();
-            params.put(SERVICE_INSTALLER.getID(), new InstallableFile(
-                    serviceInstallerPath, serviceInstallerPath.getFileName()));
+        try {
+            var serviceInstallerResource = initServiceInstallerResource(params);
+            if (serviceInstallerResource != null) {
+                var serviceInstallerPath = serviceInstallerResource.getExternalPath();
+                params.put(SERVICE_INSTALLER.getID(), new InstallableFile(
+                        serviceInstallerPath, serviceInstallerPath.getFileName()));
+            }
+        } catch (ConfigException ex) {
+            throw new PackagerException(ex);
         }
     }
 
@@ -763,7 +760,7 @@ private static void ensureByMutationFileIsRTF(Path f) {
     }
 
     private static OverridableResource initServiceInstallerResource(
-            Map<String, ? super Object> params) {
+            Map<String, ? super Object> params) throws ConfigException {
         if (StandardBundlerParam.isRuntimeInstaller(params)) {
             // Runtime installer doesn't install launchers,
             // service installer not needed
@@ -781,12 +778,16 @@ private static OverridableResource initServiceInstallerResource(
         var result = createResource(null, params)
                 .setPublicName("service-installer.exe")
                 .setSourceOrder(OverridableResource.Source.External);
-        if (result.getResourceDir() == null) {
-            return null;
+        if (result.getResourceDir() != null) {
+            result.setExternal(result.getResourceDir().resolve(result.getPublicName()));
+
+            if (Files.exists(result.getExternalPath())) {
+                return result;
+            }
         }
 
-        return result.setExternal(result.getResourceDir().resolve(
-                result.getPublicName()));
+        throw new ConfigException(I18N.getString("error.missing-service-installer"),
+                I18N.getString("error.missing-service-installer.advice"));
     }
 
     private Path installerIcon;
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
index 584342397a6..506ffa59ed6 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
@@ -57,6 +57,8 @@ error.unlock-resource=Failed to unlock: {0}
 error.read-wix-l10n-file=Failed to parse {0} file
 error.extract-culture-from-wix-l10n-file=Failed to read value of culture from {0} file
 error.short-path-conv-fail=Failed to get short version of "{0}" path
+error.missing-service-installer='service-installer.exe' service installer not found in the resource directory
+error.missing-service-installer.advice=Add 'service-installer.exe' service installer to the resource directory
 
 message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
 message.potential.windows.defender.issue=Warning: Windows Defender may prevent jpackage from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
index 1adcb472b77..5d95bc7c77d 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
@@ -72,6 +72,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 import java.util.prefs.Preferences;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -805,46 +806,46 @@ String getResourceString(String key) {
     }
 
     /**
-     * Add normal prefixing/postfixing to embedded newlines in a string,
+     * Add normal prefixing/postfixing to embedded newlines in a format string,
      * bracketing with normal prefix/postfix
      *
-     * @param s the string to prefix
-     * @return the pre/post-fixed and bracketed string
+     * @param format the format string to prefix/postfix
+     * @return the pre/post-fixed and bracketed format string
      */
-    String prefix(String s) {
-         return prefix(s, feedback.getPre(), feedback.getPost());
+    String prefix(String format) {
+         return prefix(format, feedback.getPre(), feedback.getPost());
     }
 
     /**
-     * Add error prefixing/postfixing to embedded newlines in a string,
+     * Add error prefixing/postfixing to embedded newlines in a format string,
      * bracketing with error prefix/postfix
      *
-     * @param s the string to prefix
-     * @return the pre/post-fixed and bracketed string
+     * @param format the format string to prefix/postfix
+     * @return the pre/post-fixed and bracketed format string
      */
-    String prefixError(String s) {
-         return prefix(s, feedback.getErrorPre(), feedback.getErrorPost());
+    String prefixError(String format) {
+         return prefix(format, feedback.getErrorPre(), feedback.getErrorPost());
     }
 
     /**
-     * Add prefixing/postfixing to embedded newlines in a string,
+     * Add prefixing/postfixing to embedded newlines in a format string,
      * bracketing with prefix/postfix.  No prefixing when non-interactive.
-     * Result is expected to be the format for a printf.
+     * Both input and result strings are expected to be the format for a printf.
      *
-     * @param s the string to prefix
-     * @param pre the string to prepend to each line
-     * @param post the string to append to each line (replacing newline)
-     * @return the pre/post-fixed and bracketed string
+     * @param format the format string to prefix
+     * @param pre the string to prepend to each line (printf safe)
+     * @param post the string to append to each line (replacing newline; printf safe)
+     * @return the pre/post-fixed and bracketed format string
      */
-    String prefix(String s, String pre, String post) {
-        if (s == null) {
+    String prefix(String format, String pre, String post) {
+        if (format == null) {
             return "";
         }
         if (!interactiveModeBegun) {
             // messages expect to be new-line terminated (even when not prefixed)
-            return s + "%n";
+            return format + "%n";
         }
-        String pp = s.replaceAll("\\R", post + pre);
+        String pp = format.replaceAll("\\R", post + pre);
         if (pp.endsWith(post + pre)) {
             // prevent an extra prefix char and blank line when the string
             // already terminates with newline
@@ -859,7 +860,7 @@ String prefix(String s, String pre, String post) {
      * @param key the resource key
      */
     void hardrb(String key) {
-        hard(getResourceString(key));
+        hard(escape(getResourceString(key)));
     }
 
     /**
@@ -882,7 +883,7 @@ String messageFormat(String key, Object... args) {
      */
     @Override
     public void hardmsg(String key, Object... args) {
-        hard(messageFormat(key, args));
+        hard(escape(messageFormat(key, args)));
     }
 
     /**
@@ -912,7 +913,7 @@ public void fluffmsg(String key, Object... args) {
     }
 
     <T> void hardPairs(Stream<T> stream, Function<T, String> a, Function<T, String> b) {
-        Map<String, String> a2b = stream.collect(toMap(a, b,
+        Map<String, String> a2b = stream.collect(toMap(a, b.andThen(this::escape),
                 (m1, m2) -> m1,
                 LinkedHashMap::new));
         for (Entry<String, String> e : a2b.entrySet()) {
@@ -921,6 +922,13 @@ <T> void hardPairs(Stream<T> stream, Function<T, String> a, Function<T, String>
         }
     }
 
+    /**
+     * Escape '%' signs in a plain string to make it a valid format string.
+     */
+    String escape(Object s) {
+        return s.toString().replace("%", "%%");
+    }
+
     /**
      * Trim whitespace off end of string
      *
@@ -2332,7 +2340,7 @@ void showSetStart() {
             sb.append(startup.show(false));
             sb.append(startup.showDetail());
         }
-        hard(sb.toString());
+        hard(escape(sb));
     }
 
     private void showIndent() {
@@ -3262,7 +3270,7 @@ private boolean cmdEnv(String rawargs) {
                 sb.append(a);
             }
             if (sb.length() > 0) {
-                hard(sb.toString());
+                hard(escape(sb));
             }
             return false;
         }
@@ -3777,7 +3785,7 @@ private FormatAction toAction(Status status, Status previousStatus, boolean isSi
             case NONEXISTENT:
             default:
                 // Should not occur
-                error("Unexpected status: " + previousStatus.toString() + "=>" + status.toString());
+                error("Unexpected status: %s=>%s", previousStatus, status);
                 act = FormatAction.DROPPED;
         }
         return act;
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
index 4cf667a3787..44ad74611e5 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
@@ -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
@@ -1052,7 +1052,7 @@ Show the normal prompt and the continuation-prompts:\n\
 \n\
 Where <mode> is the name of a previously defined feedback mode.\n\
 Where <prompt> and <continuation-prompt> are quoted strings to be printed as input prompts.\n\
-Both may optionally contain '%%s' which will be substituted with the next snippet ID --\n\
+Both may optionally contain '%s' which will be substituted with the next snippet ID --\n\
 note that what is entered may not be assigned that ID, for example it may be an error or command.\n\
 The continuation-prompt is used on the second and subsequent lines of a multi-line snippet.\n\
 \n\
diff --git a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
index 7df6c6b933e..0192e77da94 100644
--- a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
+++ b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
@@ -341,4 +341,133 @@ TEST_VM(RiscV, cmpxchg_int8_maybe_zacas) {
   }
 }
 
+template <typename TESTSIZE, Assembler::operand_size ASMSIZE>
+class WeakCmpxchgTester {
+ public:
+  typedef TESTSIZE (*cmpxchg_narrow)(intptr_t addr, TESTSIZE expected, TESTSIZE new_value, TESTSIZE result,
+                                   int64_t scratch0, int64_t scratch1, int64_t scratch2);
+
+  typedef TESTSIZE (*cmpxchg_func)(intptr_t addr, TESTSIZE expected, TESTSIZE new_value, TESTSIZE result);
+
+  static TESTSIZE weak_narrow_cmpxchg(intptr_t addr, TESTSIZE expected, TESTSIZE new_value) {
+    BufferBlob* bb = BufferBlob::create("riscvTest", 128);
+    CodeBuffer code(bb);
+    MacroAssembler _masm(&code);
+    address entry = _masm.pc();
+    {
+       _masm.weak_cmpxchg_narrow_value(/*addr*/ c_rarg0, /*expected*/ c_rarg1, /*new_value*/ c_rarg2,
+                                      ASMSIZE, Assembler::relaxed, Assembler::relaxed,
+                                      /*result*/ c_rarg3, c_rarg4, c_rarg5, c_rarg6); /* Uses also t0-t1, caller saved */
+      _masm.mv(c_rarg0, c_rarg3);
+      _masm.ret();
+    }
+    _masm.flush(); // icache invalidate
+    TESTSIZE ret = ((cmpxchg_narrow)entry)(addr, expected, new_value, /*result*/ 67, -1, -1, -1);
+    BufferBlob::free(bb);
+    return ret;
+  }
+
+  static TESTSIZE weak_cmpxchg(intptr_t addr, TESTSIZE expected, TESTSIZE new_value) {
+    BufferBlob* bb = BufferBlob::create("riscvTest", 128);
+    CodeBuffer code(bb);
+    MacroAssembler _masm(&code);
+    address entry = _masm.pc();
+    {
+       _masm.weak_cmpxchg(/*addr*/ c_rarg0, /*expected*/ c_rarg1, /*new_value*/ c_rarg2,
+                          ASMSIZE, Assembler::relaxed, Assembler::relaxed, /*result*/ c_rarg3);
+      _masm.mv(c_rarg0, c_rarg3);
+      _masm.ret();
+    }
+    _masm.flush(); // icache invalidate
+    TESTSIZE ret = ((cmpxchg_func)entry)(addr, expected, new_value, /*result*/ 67);
+    BufferBlob::free(bb);
+    return ret;
+  }
+};
+
+template <typename TESTSIZE, Assembler::operand_size ASMSIZE>
+void run_weak_cmpxchg_narrow_value_tests() {
+  // Assume natural aligned
+  TESTSIZE data[8];
+  TESTSIZE ret;
+  for (int i = 0; i < 7; i++) {
+    memset(data, -1, sizeof(data));
+
+    data[i] = 121;
+    ret = WeakCmpxchgTester<TESTSIZE, ASMSIZE>::weak_narrow_cmpxchg((intptr_t)&data[i], 121, 42);
+    ASSERT_EQ(ret, 1);
+    ASSERT_EQ(data[i], 42);
+
+    data[i] = 121;
+    ret = WeakCmpxchgTester<TESTSIZE, ASMSIZE>::weak_narrow_cmpxchg((intptr_t)&data[i], 120, 42);
+    ASSERT_EQ(ret, 0);
+    ASSERT_EQ(data[i], 121);
+  }
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int16_lr_sc) {
+  bool zacas = UseZacas;
+  UseZacas = false;
+  run_weak_cmpxchg_narrow_value_tests<int16_t, Assembler::int16>();
+  UseZacas = zacas;
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int8_lr_sc) {
+  bool zacas = UseZacas;
+  UseZacas = false;
+  run_weak_cmpxchg_narrow_value_tests<int8_t, Assembler::int8>();
+  UseZacas = zacas;
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int16_maybe_zacas) {
+  if (UseZacas) {
+    run_weak_cmpxchg_narrow_value_tests<int16_t, Assembler::int16>();
+  }
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int8_maybe_zacas) {
+  if (UseZacas) {
+    run_weak_cmpxchg_narrow_value_tests<int8_t, Assembler::int8>();
+  }
+}
+
+template <typename TESTSIZE, Assembler::operand_size ASMSIZE>
+void run_weak_cmpxchg_tests() {
+  TESTSIZE data = 121;
+  TESTSIZE ret = WeakCmpxchgTester<TESTSIZE, ASMSIZE>::weak_cmpxchg((intptr_t)&data, 121, 42);
+  ASSERT_EQ(ret, 1);
+  ASSERT_EQ(data, 42);
+
+  data = 121;
+  ret = WeakCmpxchgTester<TESTSIZE, ASMSIZE>::weak_cmpxchg((intptr_t)&data, 120, 42);
+  ASSERT_EQ(ret, 0);
+  ASSERT_EQ(data, 121);
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int64_lr_sc) {
+  bool zacas = UseZacas;
+  UseZacas = false;
+  run_weak_cmpxchg_tests<int64_t, Assembler::int64>();
+  UseZacas = zacas;
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int64_maybe_zacas) {
+  if (UseZacas) {
+    run_weak_cmpxchg_tests<int64_t, Assembler::int64>();
+  }
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int32_lr_sc) {
+  bool zacas = UseZacas;
+  UseZacas = false;
+  run_weak_cmpxchg_tests<int32_t, Assembler::int32>();
+  UseZacas = zacas;
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int32_maybe_zacas) {
+  if (UseZacas) {
+    run_weak_cmpxchg_tests<int32_t, Assembler::int32>();
+  }
+}
+
 #endif  // RISCV
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index d68c015496c..96743c4fe29 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -55,11 +55,7 @@ hotspot_runtime_no_cds = \
 
 hotspot_runtime_non_cds_mode = \
   runtime \
-  -runtime/cds/CheckSharingWithDefaultArchive.java \
-  -runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java \
-  -runtime/cds/appcds/dynamicArchive/DynamicSharedSymbols.java \
-  -runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java \
-  -runtime/cds/appcds/jcmd
+  -runtime/cds
 
 hotspot_handshake = \
   runtime/handshake
@@ -397,6 +393,8 @@ tier1_runtime = \
  -runtime/Metaspace/FragmentMetaspace.java \
  -runtime/Metaspace/FragmentMetaspaceSimple.java \
  -runtime/MirrorFrame/Test8003720.java \
+ -runtime/Monitor/StressWrapper_TestRecursiveLocking_36M.java \
+ -runtime/Monitor/TestRecursiveLocking.java \
  -runtime/modules/LoadUnloadModuleStress.java \
  -runtime/modules/ModuleStress/ExportModuleStressTest.java \
  -runtime/modules/ModuleStress/ModuleStressGC.java \
@@ -664,6 +662,7 @@ hotspot_tier2_runtime = \
  -runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java \
  -runtime/CompressedOops/UseCompressedOops.java \
  -runtime/InvocationTests \
+ -runtime/Monitor/StressWrapper_TestRecursiveLocking_36M.java \
  -runtime/Thread/TestThreadDumpMonitorContention.java \
  -:tier1_runtime \
  -:hotspot_tier2_runtime_platform_agnostic \
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestFPConversion.java b/test/hotspot/jtreg/compiler/c2/irTests/TestFPConversion.java
new file mode 100644
index 00000000000..d9eb8c806d8
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestFPConversion.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @bug 8345219
+ * @summary Test that code generation for FP conversion works as intended
+ * @library /test/lib /
+ * @requires os.arch != "x86" & os.arch != "i386"
+ * @run driver compiler.c2.irTests.TestFPConversion
+ */
+public class TestFPConversion {
+    static final double[] DOUBLES = new double[] {
+            Double.NEGATIVE_INFINITY,
+            -Double.MAX_VALUE,
+            -1.0,
+            -Double.MIN_VALUE,
+            -0.0,
+            0.0,
+            Double.MIN_VALUE,
+            1.0,
+            Double.MAX_VALUE,
+            Double.POSITIVE_INFINITY,
+            Double.NaN,
+    };
+
+    static final float[] FLOATS = new float[] {
+            Float.NEGATIVE_INFINITY,
+            -Float.MAX_VALUE,
+            -1.0F,
+            -Float.MIN_VALUE,
+            -0.0F,
+            0.0F,
+            Float.MIN_VALUE,
+            1.0F,
+            Float.MAX_VALUE,
+            Float.POSITIVE_INFINITY,
+            Float.NaN,
+    };
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOV_D2L, "1"})
+    public long doubleToRawLongBits(double x) {
+        return Double.doubleToRawLongBits(x);
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOV_D2L, "1"})
+    public long doubleToLongBits(double x) {
+        return Double.doubleToLongBits(x);
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOV_L2D, "1"})
+    public double longBitsToDouble(long x) {
+        return Double.longBitsToDouble(x);
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOV_F2I, "1"})
+    public int floatToRawIntBits(float x) {
+        return Float.floatToRawIntBits(x);
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOV_F2I, "1"})
+    public int floatToIntBits(float x) {
+        return Float.floatToIntBits(x);
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOV_I2F, "1"})
+    public float intBitsToFloat(int x) {
+        return Float.intBitsToFloat(x);
+    }
+
+    @Run(test = {"doubleToRawLongBits", "doubleToLongBits", "longBitsToDouble",
+                 "floatToRawIntBits", "floatToIntBits", "intBitsToFloat"})
+    public void runTests() {
+        for (int i = 0; i < DOUBLES.length; i++) {
+            double d = DOUBLES[i];
+            long l1 = doubleToRawLongBits(d);
+            long l2 = doubleToLongBits(d);
+            double d1 = longBitsToDouble(l1);
+            double d2 = longBitsToDouble(l2);
+            Asserts.assertEquals(d, d1);
+            Asserts.assertEquals(d, d2);
+        }
+        for (int i = 0; i < FLOATS.length; i++) {
+            float f = FLOATS[i];
+            int i1 = floatToRawIntBits(f);
+            int i2 = floatToIntBits(f);
+            float f1 = intBitsToFloat(i1);
+            float f2 = intBitsToFloat(i2);
+            Asserts.assertEquals(f, f1);
+            Asserts.assertEquals(f, f2);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 1eb6251b2bb..35e10c7ae9f 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1169,6 +1169,26 @@ public class IRNode {
         beforeMatchingNameRegex(MOD_L, "ModL");
     }
 
+    public static final String MOV_F2I = PREFIX + "MOV_F2I" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MOV_F2I, "MoveF2I");
+    }
+
+    public static final String MOV_I2F = PREFIX + "MOV_I2F" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MOV_I2F, "MoveI2F");
+    }
+
+    public static final String MOV_D2L = PREFIX + "MOV_D2L" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MOV_D2L, "MoveD2L");
+    }
+
+    public static final String MOV_L2D = PREFIX + "MOD_L2D" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MOV_L2D, "MoveL2D");
+    }
+
     public static final String MUL = PREFIX + "MUL" + POSTFIX;
     static {
         beforeMatchingNameRegex(MUL, "Mul(I|L|F|D)");
diff --git a/test/hotspot/jtreg/runtime/Monitor/StressWrapper_TestRecursiveLocking_36M.java b/test/hotspot/jtreg/runtime/Monitor/StressWrapper_TestRecursiveLocking_36M.java
new file mode 100644
index 00000000000..34bf5da64d9
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/Monitor/StressWrapper_TestRecursiveLocking_36M.java
@@ -0,0 +1,207 @@
+/*
+ * 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 id=Xint_outer_inner
+ * @requires vm.flagless
+ * @summary Tests recursive locking in -Xint in outer then inner mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ */
+
+/*
+ * @test id=Xint_alternate_AB
+ * @requires vm.flagless
+ * @summary Tests recursive locking in -Xint in alternate A and B mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ */
+
+/*
+ * @test id=C1_outer_inner
+ * @requires vm.flagless
+ * @requires vm.compiler1.enabled
+ * @summary Tests recursive locking in C1 in outer then inner mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ */
+
+/*
+ * @test id=C1_alternate_AB
+ * @requires vm.flagless
+ * @requires vm.compiler1.enabled
+ * @summary Tests recursive locking in C1 in alternate A and B mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ */
+
+/*
+ * @test id=C2_outer_inner
+ * @requires vm.flagless
+ * @requires vm.compiler2.enabled
+ * @summary Tests recursive locking in C2 in outer then inner mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:-EliminateNestedLocks
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:-EliminateNestedLocks
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:-EliminateNestedLocks
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 1
+ */
+
+/*
+ * @test id=C2_alternate_AB
+ * @requires vm.flagless
+ * @requires vm.compiler2.enabled
+ * @summary Tests recursive locking in C2 in alternate A and B mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ *
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:LockingMode=0
+ *     -XX:-EliminateNestedLocks
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:LockingMode=1
+ *     -XX:-EliminateNestedLocks
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ *
+ * @run main/othervm/timeout=240 -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:LockingMode=2
+ *     -XX:-EliminateNestedLocks
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 120 2
+ */
diff --git a/test/hotspot/jtreg/runtime/Monitor/TestRecursiveLocking.java b/test/hotspot/jtreg/runtime/Monitor/TestRecursiveLocking.java
new file mode 100644
index 00000000000..f9193b6eeb5
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/Monitor/TestRecursiveLocking.java
@@ -0,0 +1,568 @@
+/*
+ * 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 id=Xint_outer_inner
+ * @requires vm.flagless
+ * @summary Tests recursive locking in -Xint in outer then inner mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ */
+
+/*
+ * @test id=Xint_alternate_AB
+ * @requires vm.flagless
+ * @summary Tests recursive locking in -Xint in alternate A and B mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -Xint
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ */
+
+/*
+ * @test id=C1_outer_inner
+ * @requires vm.flagless
+ * @requires vm.compiler1.enabled
+ * @summary Tests recursive locking in C1 in outer then inner mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ */
+
+/*
+ * @test id=C1_alternate_AB
+ * @requires vm.flagless
+ * @requires vm.compiler1.enabled
+ * @summary Tests recursive locking in C1 in alternate A and B mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:TieredStopAtLevel=1
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ */
+
+/*
+ * @test id=C2_outer_inner
+ * @requires vm.flagless
+ * @requires vm.compiler2.enabled
+ * @summary Tests recursive locking in C2 in outer then inner mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:-EliminateNestedLocks
+ *     -XX:LockingMode=0
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:-EliminateNestedLocks
+ *     -XX:LockingMode=1
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:-EliminateNestedLocks
+ *     -XX:LockingMode=2
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 1
+ */
+
+/*
+ * @test id=C2_alternate_AB
+ * @requires vm.flagless
+ * @requires vm.compiler2.enabled
+ * @summary Tests recursive locking in C2 in alternate A and B mode.
+ * @library /testlibrary /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ *
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:LockingMode=0
+ *     -XX:-EliminateNestedLocks
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:LockingMode=1
+ *     -XX:-EliminateNestedLocks
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ *
+ * @run main/othervm -Xbootclasspath/a:.
+ *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *     -XX:LockingMode=2
+ *     -XX:-EliminateNestedLocks
+ *     -ms256m -mx256m
+ *     TestRecursiveLocking 5 2
+ */
+
+import jdk.test.lib.Asserts;
+import jdk.test.whitebox.WhiteBox;
+import jtreg.SkippedException;
+
+public class TestRecursiveLocking {
+    static final WhiteBox WB = WhiteBox.getWhiteBox();
+    static final int flagLockingMode = WB.getIntVMFlag("LockingMode").intValue();
+    static final int constLockStackCapacity = WB.getLockStackCapacity();
+    static final int LM_MONITOR = 0;
+    static final int LM_LEGACY = 1;
+    static final int LM_LIGHTWEIGHT = 2;
+    static final int def_mode = 2;
+    static final int def_n_secs = 30;
+    static final SyncThread syncThread = new SyncThread();
+
+    // This SynchronizedObject class and the OUTER followed by INNER testing
+    // model is adapted from runtime/lockStack/TestLockStackCapacity.java.
+    static class SynchronizedObject {
+        private int counter;
+
+        synchronized void runInner(int depth, SynchronizedObject outer) {
+            counter++;
+
+            // Legacy mode has no lock stack, i.e., there is no limit
+            // on recursion, so for legacy mode we can't say that
+            // "outer" must be inflated here, which we can say for all
+            // the other locking modes.
+            if (flagLockingMode != LM_LEGACY) {
+                outer.assertInflated();
+            }
+
+            // We haven't reached the stack lock capacity (recursion
+            // level), so we shouldn't be inflated here. Except for
+            // monitor mode, which is always inflated.
+            if (flagLockingMode != LM_MONITOR) {
+                assertNotInflated();
+            }
+            if (depth == 1) {
+                return;
+            } else {
+                runInner(depth - 1, outer);
+            }
+            if (flagLockingMode != LM_MONITOR) {
+                assertNotInflated();
+            }
+        }
+
+        synchronized void runOuter(int depth, SynchronizedObject inner) {
+            counter++;
+
+            if (flagLockingMode != LM_MONITOR) {
+                assertNotInflated();
+            }
+            if (depth == 1) {
+                inner.runInner(constLockStackCapacity, this);
+            } else {
+                runOuter(depth - 1, inner);
+            }
+            if (flagLockingMode != LM_LEGACY) {
+                assertInflated();
+            }
+        }
+
+        // This test nests x recursive locks of INNER, in x recursive
+        // locks of OUTER. The number x is taken from the max number
+        // of elements in the lock stack.
+        public void runOuterInnerTest() {
+            final SynchronizedObject OUTER = new SynchronizedObject();
+            final SynchronizedObject INNER = new SynchronizedObject();
+
+            // Just checking since they are new objects:
+            OUTER.assertNotInflated();
+            INNER.assertNotInflated();
+
+            synchronized (OUTER) {
+                OUTER.counter++;
+
+                if (flagLockingMode != LM_MONITOR) {
+                    OUTER.assertNotInflated();
+                }
+                INNER.assertNotInflated();
+                OUTER.runOuter(constLockStackCapacity - 1, INNER);
+
+                if (flagLockingMode != LM_LEGACY) {
+                    OUTER.assertInflated();
+                }
+                if (flagLockingMode != LM_MONITOR) {
+                    INNER.assertNotInflated();
+                }
+            }
+
+            // Verify that the nested monitors have been properly released:
+            syncThread.verifyCanBeSynced(OUTER);
+            syncThread.verifyCanBeSynced(INNER);
+
+            Asserts.assertEquals(OUTER.counter, constLockStackCapacity);
+            Asserts.assertEquals(INNER.counter, constLockStackCapacity);
+        }
+
+        synchronized void runA(int depth, SynchronizedObject B) {
+            counter++;
+
+            if (flagLockingMode == LM_LIGHTWEIGHT) {
+                // First time we lock A, A is the only one on the lock
+                // stack.
+                if (counter == 1) {
+                    assertNotInflated();
+                } else {
+                    // Second time we want to lock A, the lock stack
+                    // looks like this [A, B]. Lightweight locking
+                    // doesn't allow interleaving ([A, B, A]), instead
+                    // it inflates A and removes it from the lock
+                    // stack. Which leaves us with only [B] on the
+                    // lock stack. After more recursions it will grow
+                    // to [B, B ... B].
+                    assertInflated();
+                }
+            } else if (flagLockingMode == LM_MONITOR) {
+                assertInflated();
+            }
+
+            // Call runB() at the same depth as runA's depth:
+            B.runB(depth, this);
+        }
+
+        synchronized void runB(int depth, SynchronizedObject A) {
+            counter++;
+
+            if (flagLockingMode != LM_MONITOR) {
+                // Legacy tolerates endless recursions. While testing
+                // lightweight we don't go deeper than the size of the
+                // lock stack, which in this test case will be filled
+                // with a number of B-elements. See comment in runA()
+                // above for more info.
+                assertNotInflated();
+            } else {
+                assertInflated();
+            }
+
+            if (depth == 1) {
+                // Reached LockStackCapacity in depth so we're done.
+                return;
+            } else {
+                A.runA(depth - 1, this);
+            }
+        }
+
+        // This test alternates by locking A and B.
+        public void runAlternateABTest() {
+            final SynchronizedObject A = new SynchronizedObject();
+            final SynchronizedObject B = new SynchronizedObject();
+
+            // Just checking since they are new objects:
+            A.assertNotInflated();
+            B.assertNotInflated();
+
+            A.runA(constLockStackCapacity, B);
+
+            // Verify that the nested monitors have been properly released:
+            syncThread.verifyCanBeSynced(A);
+            syncThread.verifyCanBeSynced(B);
+
+            Asserts.assertEquals(A.counter, constLockStackCapacity);
+            Asserts.assertEquals(B.counter, constLockStackCapacity);
+            if (flagLockingMode == LM_LEGACY) {
+                A.assertNotInflated();
+            }
+            // Implied else: for LM_MONITOR or LM_LIGHTWEIGHT it can be
+            // either inflated or not because A is not locked anymore
+            // and subject to deflation.
+
+            if (flagLockingMode != LM_MONITOR) {
+                B.assertNotInflated();
+            }
+        }
+
+        void assertNotInflated() {
+            Asserts.assertFalse(WB.isMonitorInflated(this));
+        }
+
+        void assertInflated() {
+            Asserts.assertTrue(WB.isMonitorInflated(this));
+        }
+    }
+
+    static void usage() {
+        System.err.println();
+        System.err.println("Usage: java TestRecursiveLocking [n_secs]");
+        System.err.println("       java TestRecursiveLocking n_secs [mode]");
+        System.err.println();
+        System.err.println("where:");
+        System.err.println("    n_secs  ::= > 0");
+        System.err.println("            Default n_secs is " + def_n_secs + ".");
+        System.err.println("    mode    ::= 1 - outer and inner");
+        System.err.println("            ::= 2 - alternate A and B");
+        System.err.println("            Default mode is " + def_mode + ".");
+        System.exit(1);
+    }
+
+    public static void main(String... argv) throws Exception {
+        int mode = def_mode;
+        int n_secs = def_n_secs;
+
+        if (argv.length != 0 && argv.length != 1 && argv.length != 2) {
+            usage();
+        } else if (argv.length > 0) {
+            try {
+                n_secs = Integer.parseInt(argv[0]);
+                if (n_secs <= 0) {
+                    throw new NumberFormatException("Not > 0: '" + argv[0]
+                                                    + "'");
+                }
+            } catch (NumberFormatException nfe) {
+                System.err.println();
+                System.err.println(nfe);
+                System.err.println("ERROR: '" + argv[0]
+                                   + "': invalid n_secs value.");
+                usage();
+            }
+
+            if (argv.length > 1) {
+                try {
+                    mode = Integer.parseInt(argv[1]);
+                    if (mode != 1 && mode != 2) {
+                        throw new NumberFormatException("Not 1 -> 2: '"
+                                                        + argv[1] + "'");
+                    }
+                } catch (NumberFormatException nfe) {
+                    System.err.println();
+                    System.err.println(nfe);
+                    System.err.println("ERROR: '" + argv[1]
+                                       + "': invalid mode value.");
+                    usage();
+                }
+            }
+        }
+
+        System.out.println("INFO: LockingMode=" + flagLockingMode);
+        System.out.println("INFO: LockStackCapacity=" + constLockStackCapacity);
+        System.out.println("INFO: n_secs=" + n_secs);
+        System.out.println("INFO: mode=" + mode);
+
+        long loopCount = 0;
+        long endTime = System.currentTimeMillis() + n_secs * 1000;
+
+        syncThread.waitForStart();
+
+        while (System.currentTimeMillis() < endTime) {
+            loopCount++;
+            SynchronizedObject syncObj = new SynchronizedObject();
+            switch (mode) {
+            case 1:
+                syncObj.runOuterInnerTest();
+                break;
+
+            case 2:
+                syncObj.runAlternateABTest();
+                break;
+
+            default:
+                throw new RuntimeException("bad mode parameter: " + mode);
+            }
+        }
+
+        syncThread.setDone();
+        try {
+            syncThread.join();
+        } catch (InterruptedException ie) {
+            // This should not happen.
+            ie.printStackTrace();
+        }
+
+        System.out.println("INFO: main executed " + loopCount + " loops in "
+                           + n_secs + " seconds.");
+    }
+}
+
+class SyncThread extends Thread {
+    static final boolean verbose = false;  // set to true for debugging
+    private boolean done = false;
+    private boolean haveWork = false;
+    private Object obj;
+    private Object waiter = new Object();
+
+    public void run() {
+        if (verbose) System.out.println("SyncThread: running.");
+        synchronized (waiter) {
+            // Let main know that we are running:
+            if (verbose) System.out.println("SyncThread: notify main running.");
+            waiter.notify();
+
+            while (!done) {
+                if (verbose) System.out.println("SyncThread: waiting.");
+                try {
+                    waiter.wait();
+                } catch (InterruptedException ie) {
+                    // This should not happen.
+                    ie.printStackTrace();
+                }
+                if (haveWork) {
+                    if (verbose) System.out.println("SyncThread: working.");
+                    synchronized (obj) {
+                    }
+                    if (verbose) System.out.println("SyncThread: worked.");
+                    haveWork = false;
+                    waiter.notify();
+                    if (verbose) System.out.println("SyncThread: notified.");
+                }
+                else if (verbose) {
+                    System.out.println("SyncThread: notified without work.");
+                }
+            }
+        }
+        if (verbose) System.out.println("SyncThread: exiting.");
+    }
+
+    public void setDone() {
+        synchronized (waiter) {
+            if (verbose) System.out.println("main: set done.");
+            done = true;
+            waiter.notify();
+        }
+    }
+
+    public void verifyCanBeSynced(Object obj) {
+        synchronized (waiter) {
+            if (verbose) System.out.println("main: queueing up work.");
+            this.obj = obj;
+            haveWork = true;
+            if (verbose) System.out.println("main: notifying SyncThread.");
+            waiter.notify();
+            if (verbose) System.out.println("main: waiting for SyncThread.");
+            while (haveWork) {
+                try {
+                    waiter.wait();
+                } catch (InterruptedException ie) {
+                    // This should not happen.
+                    ie.printStackTrace();
+                }
+            }
+            if (verbose) System.out.println("main: waited for SyncThread.");
+        }
+    }
+
+    public void waitForStart() {
+        synchronized (waiter) {
+            this.start();
+
+            // Wait for SyncThread to actually get running:
+            if (verbose) System.out.println("main: wait for SyncThread start.");
+            try {
+                waiter.wait();
+            } catch (InterruptedException ie) {
+                // This should not happen.
+                ie.printStackTrace();
+            }
+            if (verbose) System.out.println("main: waited for SyncThread start.");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java
index 8e33bf0bb0c..6ab9b18c1e9 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.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
@@ -63,6 +63,7 @@ public class CommandLineFlagCombo {
         "-Xint",
         "-Xmixed",
         "-Xcomp",
+        "-XX:+SegmentedCodeCache",
     };
 
     public static void main(String[] args) throws Exception {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/libHiddenClassSigTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/libHiddenClassSigTest.cpp
index b93d1fdd5d6..e25587d2ac3 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/libHiddenClassSigTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/libHiddenClassSigTest.cpp
@@ -351,10 +351,16 @@ Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
     return JNI_ERR;
   }
 
-  // enable VM_INIT event notification mode
+  // enable VM_INIT/VM_DEATH event notification modes
   err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, nullptr);
   if (err != JVMTI_ERROR_NONE) {
-    LOG1("Agent_OnLoad: Error in JVMTI SetEventNotificationMode: %d\n", err);
+    LOG1("Agent_OnLoad: Error in JVMTI SetEventNotificationMode(JVMTI_EVENT_VM_INIT): %d\n", err);
+    failed = true;
+    return JNI_ERR;
+  }
+  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, nullptr);
+  if (err != JVMTI_ERROR_NONE) {
+    LOG1("Agent_OnLoad: Error in JVMTI SetEventNotificationMode(JVMTI_EVENT_VM_DEATH): %d\n", err);
     failed = true;
     return JNI_ERR;
   }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/VMObjectAlloc/libVMObjectAlloc.cpp b/test/hotspot/jtreg/serviceability/jvmti/VMObjectAlloc/libVMObjectAlloc.cpp
index a4166322d78..3ab0c7ff1b4 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/VMObjectAlloc/libVMObjectAlloc.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/VMObjectAlloc/libVMObjectAlloc.cpp
@@ -108,6 +108,10 @@ Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
   if (err != JVMTI_ERROR_NONE) {
     return JNI_ERR;
   }
+  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, nullptr);
+  if (err != JVMTI_ERROR_NONE) {
+    return JNI_ERR;
+  }
 
   return JNI_OK;
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp
index 21285d32825..2babf82e02e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp
@@ -116,6 +116,7 @@ Java_nsk_share_ReferringObject_createJNILocalReferenceNative(JNIEnv *env,
                 env->ThrowNew(
                     env->FindClass("nsk/share/TestJNIError"),
                     "NewLocalRef return null");
+                return;
         }
 
         klass = env->GetObjectClass(createWicket);
@@ -123,8 +124,11 @@ Java_nsk_share_ReferringObject_createJNILocalReferenceNative(JNIEnv *env,
         // notify another thread that JNI local reference has been created
         env->CallVoidMethod(createWicket,
                             env->GetMethodID(klass, "unlock", "()V"));
+        if (env->ExceptionCheck()) {
+          return;
+        }
 
-        // wait till JNI local reference can be released (it will heppen then we will leave the method)
+        // wait till JNI local reference can be released (it will happen then we will leave the method)
         env->CallVoidMethod(deleteWicket,
                             env->GetMethodID(klass, "waitFor", "()V"));
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/libNativeMethodsTestThread.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/libNativeMethodsTestThread.cpp
index beb9e90a995..2c16e3b12b9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/libNativeMethodsTestThread.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/libNativeMethodsTestThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -33,6 +33,10 @@ static void logMessage(JNIEnv *env, jobject thisObject, jstring message)
         env->CallVoidMethod(thisObject,
                             env->GetMethodID(klass, "log", "(Ljava/lang/String;)V"),
                             message);
+        if (env->ExceptionOccurred()) {
+                env->ExceptionDescribe();
+                env->FatalError("ERROR: Failed to log message.");
+        }
 }
 
 JNIEXPORT void JNICALL
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp
index f54e15ff6cf..fee28595a43 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp
@@ -66,6 +66,7 @@ This method executes JNI analog for following Java code:
                 env->ThrowNew(
                     env->FindClass("nsk/share/TestJNIError"),
                     "MonitorEnter return non-zero");
+                return;
         }
 
         thisObjectClass = env->GetObjectClass(thisObject);
@@ -78,6 +79,9 @@ This method executes JNI analog for following Java code:
 
         env->CallVoidMethod(wicketObject,
                             env->GetMethodID(wicketClass, "unlockAll", "()V"));
+        if (env->ExceptionOccurred()) {
+                return;
+        }
 
         // step2.waitFor()
         field = env->GetFieldID(thisObjectClass, "step2", "Lnsk/share/Wicket;");
@@ -85,6 +89,9 @@ This method executes JNI analog for following Java code:
 
         env->CallVoidMethod(wicketObject,
                             env->GetMethodID(wicketClass, "waitFor", "()V"));
+        if (env->ExceptionOccurred()) {
+                return;
+        }
 
         // readyWicket.unlock()
         field = env->GetFieldID(thisObjectClass, "readyWicket", "Lnsk/share/Wicket;");
@@ -92,6 +99,9 @@ This method executes JNI analog for following Java code:
 
         env->CallVoidMethod(wicketObject,
                             env->GetMethodID(wicketClass, "unlock", "()V"));
+        if (env->ExceptionOccurred()) {
+                return;
+        }
 
         // inner.lock()
         field = env->GetFieldID(thisObjectClass, "inner", "Lnsk/share/locks/DeadlockLocker;");
@@ -100,8 +110,14 @@ This method executes JNI analog for following Java code:
 
         env->CallVoidMethod(innerObject,
                             env->GetMethodID(deadlockLockerClass, "lock", "()V"));
+        if (env->ExceptionOccurred()) {
+                return;
+        }
 
         success = env->MonitorExit(thisObject);
+        if (env->ExceptionOccurred()) {
+                return;
+        }
 
         if (success != 0)
         {
diff --git a/test/jdk/com/sun/net/httpserver/FileServerHandler.java b/test/jdk/com/sun/net/httpserver/FileServerHandler.java
index bff78443839..849b5fd06de 100644
--- a/test/jdk/com/sun/net/httpserver/FileServerHandler.java
+++ b/test/jdk/com/sun/net/httpserver/FileServerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, 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
@@ -21,13 +21,9 @@
  * questions.
  */
 
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.logging.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.net.ssl.*;
+
 import com.sun.net.httpserver.*;
 
 /**
diff --git a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
index 291b74f2669..dc1f573c4e4 100644
--- a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
@@ -31,9 +31,7 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.security.AccessController;
 import java.security.KeyStore;
-import java.security.PrivilegedExceptionAction;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -359,21 +357,15 @@ private static SSLContext onlyTrustStoreContext() throws Exception {
     }
 
     private static KeyStore loadTestKeyStore() throws Exception {
-        return AccessController.doPrivileged(
-                new PrivilegedExceptionAction<KeyStore>() {
-                    @Override
-                    public KeyStore run() throws Exception {
-                        final String testKeys = System.getProperty("test.src")
-                                + "/"
-                                + "../../../../../../test/lib/jdk/test/lib/net/testkeys";
-                        try (final FileInputStream fis = new FileInputStream(testKeys)) {
-                            final char[] passphrase = "passphrase".toCharArray();
-                            final KeyStore ks = KeyStore.getInstance("PKCS12");
-                            ks.load(fis, passphrase);
-                            return ks;
-                        }
-                    }
-                });
+        final String testKeys = System.getProperty("test.src")
+                + "/"
+                + "../../../../../../test/lib/jdk/test/lib/net/testkeys";
+        try (final FileInputStream fis = new FileInputStream(testKeys)) {
+            final char[] passphrase = "passphrase".toCharArray();
+            final KeyStore ks = KeyStore.getInstance("PKCS12");
+            ks.load(fis, passphrase);
+            return ks;
+        }
     }
 
     // no-op implementations of the abstract methods of HttpsParameters
diff --git a/test/jdk/com/sun/net/httpserver/LogFilter.java b/test/jdk/com/sun/net/httpserver/LogFilter.java
index 702db801a3f..43d93ab02c2 100644
--- a/test/jdk/com/sun/net/httpserver/LogFilter.java
+++ b/test/jdk/com/sun/net/httpserver/LogFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -21,17 +21,11 @@
  * questions.
  */
 
-import java.net.*;
 import java.util.*;
 import java.text.*;
 import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.util.*;
+
 import com.sun.net.httpserver.*;
-import javax.security.auth.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.login.*;
 
 class LogFilter extends Filter {
 
diff --git a/test/jdk/com/sun/net/httpserver/SelCacheTest.java b/test/jdk/com/sun/net/httpserver/SelCacheTest.java
index 644e64419e0..1ac4d21ee3e 100644
--- a/test/jdk/com/sun/net/httpserver/SelCacheTest.java
+++ b/test/jdk/com/sun/net/httpserver/SelCacheTest.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
@@ -36,12 +36,9 @@
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import java.security.cert.*;
 import javax.net.ssl.*;
 
 /* basic http/s connectivity test
diff --git a/test/jdk/com/sun/net/httpserver/SimpleFileServer.java b/test/jdk/com/sun/net/httpserver/SimpleFileServer.java
index 0d32f37bda3..bff415c0b98 100644
--- a/test/jdk/com/sun/net/httpserver/SimpleFileServer.java
+++ b/test/jdk/com/sun/net/httpserver/SimpleFileServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, 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
@@ -21,13 +21,11 @@
  * questions.
  */
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.util.logging.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.net.ssl.*;
+
 import com.sun.net.httpserver.*;
 
 /**
diff --git a/test/jdk/com/sun/net/httpserver/Test14.java b/test/jdk/com/sun/net/httpserver/Test14.java
index 532078e8215..9b10a87642a 100644
--- a/test/jdk/com/sun/net/httpserver/Test14.java
+++ b/test/jdk/com/sun/net/httpserver/Test14.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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.security.auth.callback.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 /**
diff --git a/test/jdk/com/sun/net/httpserver/Test2.java b/test/jdk/com/sun/net/httpserver/Test2.java
index dd675c8933f..1e7710162fd 100644
--- a/test/jdk/com/sun/net/httpserver/Test2.java
+++ b/test/jdk/com/sun/net/httpserver/Test2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.security.auth.callback.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 /**
diff --git a/test/jdk/com/sun/net/httpserver/Test3.java b/test/jdk/com/sun/net/httpserver/Test3.java
index a9dab54a388..ed5b46781fd 100644
--- a/test/jdk/com/sun/net/httpserver/Test3.java
+++ b/test/jdk/com/sun/net/httpserver/Test3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,14 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.util.regex.*;
-import java.util.regex.Pattern.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.net.ssl.*;
 
 /**
  * Test pipe-lining over http
diff --git a/test/jdk/com/sun/net/httpserver/Test4.java b/test/jdk/com/sun/net/httpserver/Test4.java
index 996614c0a4c..a3502dec22e 100644
--- a/test/jdk/com/sun/net/httpserver/Test4.java
+++ b/test/jdk/com/sun/net/httpserver/Test4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.util.regex.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.net.ssl.*;
 
 /**
  * Test pipe-lining (block after read)
diff --git a/test/jdk/com/sun/net/httpserver/Test5.java b/test/jdk/com/sun/net/httpserver/Test5.java
index b57778a5226..68556bbb888 100644
--- a/test/jdk/com/sun/net/httpserver/Test5.java
+++ b/test/jdk/com/sun/net/httpserver/Test5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.util.regex.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.net.ssl.*;
 
 /**
  * Test pipe-lining (no block)
diff --git a/test/jdk/com/sun/net/httpserver/Test6.java b/test/jdk/com/sun/net/httpserver/Test6.java
index cf49cead89b..b69bc57b640 100644
--- a/test/jdk/com/sun/net/httpserver/Test6.java
+++ b/test/jdk/com/sun/net/httpserver/Test6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.security.auth.callback.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 /**
diff --git a/test/jdk/com/sun/net/httpserver/Test7.java b/test/jdk/com/sun/net/httpserver/Test7.java
index 2c204a8a60b..4b997411316 100644
--- a/test/jdk/com/sun/net/httpserver/Test7.java
+++ b/test/jdk/com/sun/net/httpserver/Test7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.security.auth.callback.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 /**
diff --git a/test/jdk/com/sun/net/httpserver/Test8.java b/test/jdk/com/sun/net/httpserver/Test8.java
index 0dfc35e50f4..58f3dc2b3b4 100644
--- a/test/jdk/com/sun/net/httpserver/Test8.java
+++ b/test/jdk/com/sun/net/httpserver/Test8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import javax.security.auth.callback.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 /**
diff --git a/test/jdk/com/sun/net/httpserver/TestLogging.java b/test/jdk/com/sun/net/httpserver/TestLogging.java
index 0dd1fe00dc5..d108d2cce5d 100644
--- a/test/jdk/com/sun/net/httpserver/TestLogging.java
+++ b/test/jdk/com/sun/net/httpserver/TestLogging.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
@@ -32,14 +32,11 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.util.logging.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import java.security.cert.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 public class TestLogging extends Test {
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6339483.java b/test/jdk/com/sun/net/httpserver/bugs/B6339483.java
index 2bfa8ad3efc..1bcf51509e0 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6339483.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6339483.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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import java.security.cert.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 public class B6339483 {
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6341616.java b/test/jdk/com/sun/net/httpserver/bugs/B6341616.java
index 82222faf08b..8a5cb98f298 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6341616.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6341616.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import java.security.cert.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 public class B6341616 {
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6526158.java b/test/jdk/com/sun/net/httpserver/bugs/B6526158.java
index c38f12b49c3..5c25911d87a 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6526158.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6526158.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import java.security.cert.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 public class B6526158 {
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6526913.java b/test/jdk/com/sun/net/httpserver/bugs/B6526913.java
index 4fb2efd67f8..de2bd398e33 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6526913.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6526913.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -33,13 +33,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import java.security.cert.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 public class B6526913 {
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6529200.java b/test/jdk/com/sun/net/httpserver/bugs/B6529200.java
index 3ce792ffcd7..774eeb93d0d 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6529200.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6529200.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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,13 +31,9 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import java.security.cert.*;
-import javax.net.ssl.*;
 
 public class B6529200 {
 
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6744329.java b/test/jdk/com/sun/net/httpserver/bugs/B6744329.java
index 9a782fd6c94..8a6290441ac 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6744329.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6744329.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -32,13 +32,10 @@
 
 import com.sun.net.httpserver.*;
 
-import java.util.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
-import java.security.*;
-import java.security.cert.*;
-import javax.net.ssl.*;
+
 import jdk.test.lib.net.URIBuilder;
 
 public class B6744329 {
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java
index 79477d23782..16a5f619c4a 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @summary Tests for FileServerHandler with SecurityManager
+ * @summary Tests file permission checks during the creation of a `FileServerHandler`
  * @library /test/lib
  * @build jdk.test.lib.net.URIBuilder
  * @run main/othervm -ea RootDirPermissionsTest true
@@ -245,7 +245,6 @@ private static void testFileGET() throws Exception {
         }
     }
 
-    @SuppressWarnings("removal")
     private static void testCreateHandler(){
         try {
             SimpleFileServer.createFileServer(LOOPBACK_ADDR, TEST_DIR, OutputLevel.NONE);
diff --git a/test/jdk/java/lang/ref/Basic.java b/test/jdk/java/lang/ref/Basic.java
index deb9ec34826..abed7fdcd64 100644
--- a/test/jdk/java/lang/ref/Basic.java
+++ b/test/jdk/java/lang/ref/Basic.java
@@ -46,8 +46,8 @@ protected void finalize() {
     };
 
     protected void finalize() {
-        Basic.finalized = true;
         System.err.println("Finalized " + this);
+        Basic.finalized = true;
     }
 
     public static class Sub { };
diff --git a/test/jdk/java/net/InetAddress/OfLiteralTest.java b/test/jdk/java/net/InetAddress/OfLiteralTest.java
index 090523a9ee9..f9f6cdb500f 100644
--- a/test/jdk/java/net/InetAddress/OfLiteralTest.java
+++ b/test/jdk/java/net/InetAddress/OfLiteralTest.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 8272215 8315767
+ * @bug 8272215 8315767 8332686
  * @summary Test for ofLiteral, ofPosixLiteral APIs in InetAddress classes
  * @run junit/othervm -Djdk.net.hosts.file=nonExistingHostsFile.txt
  *                     OfLiteralTest
@@ -373,7 +373,18 @@ private static Stream<Arguments> invalidLiteralArguments() {
                 Arguments.of(InetAddressClass.INET4_ADDRESS_POSIX, ""),            // empty
                 Arguments.of(InetAddressClass.INET4_ADDRESS_POSIX, "0x1FFFFFFFF"), // 2^33 - 1 is too large
                 Arguments.of(InetAddressClass.INET4_ADDRESS_POSIX, "0x100000000"), // 2^32 is too large
-                Arguments.of(InetAddressClass.INET4_ADDRESS_POSIX, "040000000000")
+                Arguments.of(InetAddressClass.INET4_ADDRESS_POSIX, "040000000000"),
+
+                // Empty literals
+                Arguments.of(InetAddressClass.INET_ADDRESS, ""),
+                Arguments.of(InetAddressClass.INET4_ADDRESS, ""),
+                Arguments.of(InetAddressClass.INET6_ADDRESS, ""),
+
+                // Blank literals
+                Arguments.of(InetAddressClass.INET_ADDRESS, "    "),
+                Arguments.of(InetAddressClass.INET4_ADDRESS, "    "),
+                Arguments.of(InetAddressClass.INET6_ADDRESS, "    "),
+                Arguments.of(InetAddressClass.INET4_ADDRESS_POSIX, "    ")
         );
         // Construct arguments for a test case with IPv6-scoped address with scope-id
         // specified as a string with non-existing network interface name
diff --git a/test/jdk/javax/naming/InitialContext/AppletIsNotUsed.java b/test/jdk/javax/naming/InitialContext/AppletIsNotUsed.java
deleted file mode 100644
index 6165d364405..00000000000
--- a/test/jdk/javax/naming/InitialContext/AppletIsNotUsed.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import java.util.Hashtable;
-
-/*
- * @test
- * @bug 8051422
- * @summary Make sure java.applet.Applet is not used as a source of
- *          configuration parameters for an InitialContext
- */
-public class AppletIsNotUsed {
-
-    @SuppressWarnings("deprecation")
-    public static void main(String[] args) throws NamingException {
-
-        testWith(Context.APPLET);
-        testWith("java.naming.applet");
-
-    }
-
-    private static void testWith(String appletProperty) throws NamingException {
-        Hashtable<Object, Object> env = new Hashtable<>();
-        // Deliberately put java.lang.Object rather than java.applet.Applet
-        // if an applet was used we would see a ClassCastException down there
-        env.put(appletProperty, new Object());
-        // It's ok to instantiate InitialContext with no parameters
-        // and be unaware of it right until you try to use it
-        Context ctx = new InitialContext(env);
-        boolean threw = true;
-        try {
-            ctx.lookup("whatever");
-            threw = false;
-        } catch (NoInitialContextException e) {
-            String m = e.getMessage();
-            if (m == null || m.contains("applet"))
-                throw new RuntimeException("The exception message is incorrect", e);
-        } catch (Throwable t) {
-            throw new RuntimeException(
-                    "The test was supposed to catch NoInitialContextException" +
-                            " here, but caught: " + t.getClass().getName(), t);
-        } finally {
-            ctx.close();
-        }
-
-        if (!threw)
-            throw new RuntimeException("The test was supposed to catch NoInitialContextException here");
-    }
-}
diff --git a/test/jdk/javax/swing/JButton/bug4323121.java b/test/jdk/javax/swing/JButton/bug4323121.java
index 0b352ce57eb..f23cfe43f6a 100644
--- a/test/jdk/javax/swing/JButton/bug4323121.java
+++ b/test/jdk/javax/swing/JButton/bug4323121.java
@@ -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.
  * 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,59 +24,81 @@
 /*
  * @test
  * @bug 4323121
- * @summary Tests whether any button that extends JButton always
-            returns true for isArmed()
+ * @summary Tests whether a button model always returns true for isArmed()
+ *          when mouse hovers over the button
  * @key headful
  * @run main bug4323121
  */
 
-import java.awt.Graphics;
 import java.awt.Point;
 import java.awt.Robot;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
+import java.util.concurrent.CountDownLatch;
+
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 
-public class bug4323121 {
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public final class bug4323121 {
 
     static JFrame frame;
-    static testButton button;
-    static volatile Point pt;
-    static volatile int buttonW;
-    static volatile int buttonH;
-    static volatile boolean failed = false;
+    static JButton button;
+
+    static volatile Point buttonCenter;
+
+    private static final CountDownLatch mouseEntered = new CountDownLatch(1);
+
+    // Usage of this flag is thread-safe because of using the mouseEntered latch
+    private static boolean modelArmed;
 
     public static void main(String[] args) throws Exception {
         Robot robot = new Robot();
         robot.setAutoDelay(100);
+
         try {
             SwingUtilities.invokeAndWait(() -> {
+                button = new JButton("gotcha");
+                button.addMouseListener(new MouseAdapter() {
+                    @Override
+                    public void mouseEntered(MouseEvent e) {
+                        if (button.getModel().isArmed()) {
+                            modelArmed = true;
+                        }
+                        mouseEntered.countDown();
+                    }
+                });
+
                 frame = new JFrame("bug4323121");
-                button = new testButton("gotcha");
                 frame.getContentPane().add(button);
+
                 frame.pack();
                 frame.setLocationRelativeTo(null);
                 frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
                 frame.setVisible(true);
             });
+
             robot.waitForIdle();
-            robot.delay(1000);
+
             SwingUtilities.invokeAndWait(() -> {
-                pt = button.getLocationOnScreen();
-                buttonW = button.getSize().width;
-                buttonH = button.getSize().height;
+                Point location = button.getLocationOnScreen();
+                buttonCenter = new Point(location.x + button.getWidth() / 2,
+                                         location.y + button.getHeight() / 2);
             });
-            robot.mouseMove(pt.x + buttonW / 2, pt.y + buttonH / 2);
-            robot.waitForIdle();
-            if (failed) {
-                throw new RuntimeException("Any created button returns " +
-                                    "true for isArmed()");
+
+            robot.mouseMove(buttonCenter.x, buttonCenter.y);
+
+            if (!mouseEntered.await(1, SECONDS)) {
+                throw new RuntimeException("Mouse entered event wasn't received");
+            }
+            if (modelArmed) {
+                throw new RuntimeException("getModel().isArmed() returns true "
+                                           + "when mouse hovers over the button");
             }
         } finally {
-                SwingUtilities.invokeAndWait(() -> {
+            SwingUtilities.invokeAndWait(() -> {
                 if (frame != null) {
                     frame.dispose();
                 }
@@ -84,42 +106,4 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    static class testButton extends JButton implements MouseMotionListener, MouseListener {
-        public testButton(String label) {
-            super(label);
-            addMouseMotionListener(this);
-            addMouseListener(this);
-        }
-
-        protected void paintComponent(Graphics g) {
-            super.paintComponent(g);
-        }
-
-        protected void paintBorder(Graphics g) {
-        }
-
-        public void mousePressed(MouseEvent e) {
-        }
-
-        public void mouseDragged(MouseEvent e) {
-        }
-
-        public void mouseMoved(MouseEvent e) {
-        }
-
-        public void mouseReleased(MouseEvent e) {
-        }
-
-        public void mouseEntered(MouseEvent e) {
-            if (getModel().isArmed()) {
-                failed = true;
-            }
-        }
-
-        public void mouseExited(MouseEvent e) {
-        }
-
-        public void mouseClicked(MouseEvent e) {
-        }
-    }
 }
diff --git a/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java b/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java
index eba58ef0649..ea20840d862 100644
--- a/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java
+++ b/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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,14 +26,17 @@
  * @key headful
  * @bug 4865918
  * @summary REGRESSION:JCK1.4a-runtime api/javax_swing/interactive/JScrollBarTests.html#JScrollBar
- * @author Andrey Pikalev
  * @run main bug4865918
  */
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.Dimension;
+import java.awt.Robot;
+import javax.swing.JFrame;
+import javax.swing.JScrollBar;
+import javax.swing.SwingUtilities;
+import java.awt.event.MouseEvent;
+
+import java.util.Date;
 
 public class bug4865918 {
 
@@ -43,29 +46,18 @@ public class bug4865918 {
     public static void main(String[] argv) throws Exception {
         try {
             Robot robot = new Robot();
-            SwingUtilities.invokeAndWait(new Runnable() {
-
-                public void run() {
-                    createAndShowGUI();
-                }
-            });
+            SwingUtilities.invokeAndWait(() -> createAndShowGUI());
 
             robot.waitForIdle();
+            robot.delay(1000);
 
-            SwingUtilities.invokeAndWait(new Runnable() {
-
-                @Override
-                public void run() {
-                    sbar.pressMouse();
-                }
-            });
+            SwingUtilities.invokeAndWait(() -> sbar.pressMouse());
 
             robot.waitForIdle();
+            robot.delay(200);
 
-            int value = getValue();
-
-            if (value != 9) {
-                throw new Error("The scrollbar block increment is incorect");
+            if (getValue() != 9) {
+                throw new RuntimeException("The scrollbar block increment is incorrect");
             }
         } finally {
             if (frame != null) SwingUtilities.invokeAndWait(() -> frame.dispose());
@@ -75,11 +67,8 @@ public void run() {
     private static int getValue() throws Exception {
         final int[] result = new int[1];
 
-        SwingUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                result[0] = sbar.getValue();
-            }
+        SwingUtilities.invokeAndWait(() -> {
+            result[0] = sbar.getValue();
         });
 
         return result[0];
@@ -95,8 +84,9 @@ private static void createAndShowGUI() {
 
         frame.getContentPane().add(sbar);
         frame.pack();
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
-
+        frame.toFront();
     }
 
     static class TestScrollBar extends JScrollBar {
@@ -111,7 +101,7 @@ public void pressMouse() {
             MouseEvent me = new MouseEvent(sbar,
                     MouseEvent.MOUSE_PRESSED,
                     (new Date()).getTime(),
-                    MouseEvent.BUTTON1_MASK,
+                    MouseEvent.BUTTON1_DOWN_MASK,
                     3 * getWidth() / 4, getHeight() / 2,
                     1, true);
             processMouseEvent(me);
diff --git a/test/jdk/javax/swing/JToolBar/4529206/bug4529206.java b/test/jdk/javax/swing/JToolBar/4529206/bug4529206.java
index ed4f062b24c..56f4a224e3b 100644
--- a/test/jdk/javax/swing/JToolBar/4529206/bug4529206.java
+++ b/test/jdk/javax/swing/JToolBar/4529206/bug4529206.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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 javax.swing.JTextField;
 import javax.swing.JToolBar;
 import javax.swing.SwingUtilities;
+import javax.swing.plaf.basic.BasicToolBarUI;
 
 /*
  * @test
@@ -45,7 +46,7 @@ public class bug4529206 {
     static JButton jButton1;
 
     private static void test() {
-        frame = new JFrame();
+        frame = new JFrame("bug4529206");
         JPanel jPanFrame = (JPanel) frame.getContentPane();
         jPanFrame.setLayout(new BorderLayout());
         frame.setSize(new Dimension(200, 100));
@@ -64,7 +65,7 @@ private static void test() {
     }
 
     private static void makeToolbarFloat() {
-        javax.swing.plaf.basic.BasicToolBarUI ui = (javax.swing.plaf.basic.BasicToolBarUI) jToolBar1.getUI();
+        BasicToolBarUI ui = (BasicToolBarUI) jToolBar1.getUI();
         if (!ui.isFloating()) {
             ui.setFloatingLocation(100, 100);
             ui.setFloating(true, jToolBar1.getLocation());
@@ -79,16 +80,17 @@ public static void main(String[] args) throws Exception {
         try {
             SwingUtilities.invokeAndWait(() -> test());
             Robot robot = new Robot();
-            robot.setAutoWaitForIdle(true);
+            robot.waitForIdle();
             robot.delay(1000);
 
             SwingUtilities.invokeAndWait(() -> makeToolbarFloat());
+            robot.waitForIdle();
             robot.delay(300);
 
             SwingUtilities.invokeAndWait(() -> {
                 if (frame.isFocused()) {
-                    throw
-                      new RuntimeException("setFloating does not work correctly");
+                    throw new RuntimeException(
+                        "setFloating does not work correctly");
                 }
             });
         } finally {
diff --git a/test/jdk/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java b/test/jdk/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java
index e67d2ddb588..980a9c9f528 100644
--- a/test/jdk/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java
+++ b/test/jdk/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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,17 +26,22 @@
  * @key headful
  * @bug 4278839 8233634
  * @summary Incorrect cursor movement between words at the end of line
- * @author Anton Nashatyrev
  * @library ../../../regtesthelpers
  * @build Util
  * @run main bug4278839
  */
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.awt.event.InputEvent;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 
-public class bug4278839 extends JFrame {
+public class bug4278839 {
 
     private static boolean passed = true;
     private static JTextArea area;
@@ -47,16 +52,12 @@ public static void main(String[] args) throws Exception {
         try {
 
             robo = new Robot();
-            robo.setAutoDelay(200);
+            robo.setAutoDelay(100);
 
-            SwingUtilities.invokeAndWait(new Runnable() {
-                @Override
-                public void run() {
-                    createAndShowGUI();
-                }
-            });
+            SwingUtilities.invokeAndWait(() -> createAndShowGUI());
 
             robo.waitForIdle();
+            robo.delay(1000);
 
             clickMouse();
             robo.waitForIdle();
@@ -100,33 +101,27 @@ private static int moveCaret(boolean right) throws Exception {
 
         final int[] result = new int[1];
 
-        SwingUtilities.invokeAndWait(new Runnable() {
-
-            @Override
-            public void run() {
-                result[0] = area.getCaretPosition();
-            }
+        SwingUtilities.invokeAndWait(() -> {
+            result[0] = area.getCaretPosition();
         });
 
-        int pos = result[0];
-        return pos;
+        return result[0];
     }
 
     private static void clickMouse() throws Exception {
         final Rectangle result[] = new Rectangle[1];
 
-        SwingUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                result[0] = new Rectangle(area.getLocationOnScreen(), area.getSize());
-            }
+        SwingUtilities.invokeAndWait(() -> {
+            result[0] = new Rectangle(area.getLocationOnScreen(), area.getSize());
         });
 
         Rectangle rect = result[0];
 
         robo.mouseMove(rect.x + rect.width / 2, rect.y + rect.width / 2);
-        robo.mousePress(InputEvent.BUTTON1_MASK);
-        robo.mouseRelease(InputEvent.BUTTON1_MASK);
+        robo.waitForIdle();
+        robo.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robo.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robo.waitForIdle();
     }
 
     /**
diff --git a/test/jdk/jdk/classfile/AdvancedTransformationsTest.java b/test/jdk/jdk/classfile/AdvancedTransformationsTest.java
index 450f1279810..557384e602e 100644
--- a/test/jdk/jdk/classfile/AdvancedTransformationsTest.java
+++ b/test/jdk/jdk/classfile/AdvancedTransformationsTest.java
@@ -37,8 +37,8 @@
 import java.lang.classfile.MethodModel;
 import java.lang.classfile.TypeKind;
 import jdk.internal.classfile.impl.StackMapGenerator;
-import java.lang.classfile.components.ClassRemapper;
-import java.lang.classfile.components.CodeLocalsShifter;
+import jdk.internal.classfile.components.ClassRemapper;
+import jdk.internal.classfile.components.CodeLocalsShifter;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import static helpers.TestUtil.assertEmpty;
@@ -59,9 +59,9 @@
 import java.lang.classfile.instruction.ReturnInstruction;
 import java.lang.classfile.instruction.StoreInstruction;
 import java.lang.reflect.AccessFlag;
-import java.lang.classfile.components.CodeRelabeler;
+import jdk.internal.classfile.components.CodeRelabeler;
 import java.lang.constant.ModuleDesc;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 import static java.lang.annotation.ElementType.*;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/test/jdk/jdk/classfile/ClassBuildingTest.java b/test/jdk/jdk/classfile/ClassBuildingTest.java
index bf6380ae8fe..ba58f20f7d7 100644
--- a/test/jdk/jdk/classfile/ClassBuildingTest.java
+++ b/test/jdk/jdk/classfile/ClassBuildingTest.java
@@ -35,7 +35,7 @@
 import java.lang.classfile.MethodTransform;
 import java.lang.classfile.attribute.MethodParametersAttribute;
 import java.lang.classfile.attribute.SignatureAttribute;
-import java.lang.classfile.components.ClassRemapper;
+import jdk.internal.classfile.components.ClassRemapper;
 import org.junit.jupiter.api.Test;
 
 import java.lang.constant.ClassDesc;
diff --git a/test/jdk/jdk/classfile/ClassPrinterTest.java b/test/jdk/jdk/classfile/ClassPrinterTest.java
index 7ea69f58889..5dc136f59c3 100644
--- a/test/jdk/jdk/classfile/ClassPrinterTest.java
+++ b/test/jdk/jdk/classfile/ClassPrinterTest.java
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import java.lang.classfile.*;
 import java.lang.classfile.attribute.*;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 import java.lang.constant.DirectMethodHandleDesc;
 import java.lang.constant.DynamicCallSiteDesc;
 import java.lang.constant.MethodHandleDesc;
diff --git a/test/jdk/jdk/classfile/SnippetsTest.java b/test/jdk/jdk/classfile/SnippetsTest.java
index 6999ef2a0ae..51a73b93d67 100644
--- a/test/jdk/jdk/classfile/SnippetsTest.java
+++ b/test/jdk/jdk/classfile/SnippetsTest.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
@@ -28,6 +28,7 @@
  */
 
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
 import javax.tools.StandardLocation;
 import javax.tools.ToolProvider;
@@ -41,7 +42,7 @@ public class SnippetsTest {
     @ParameterizedTest
     @ValueSource(strings = {
         "src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java",
-        "src/java.base/share/classes/java/lang/classfile/components/snippet-files/PackageSnippets.java"})
+        "src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java"})
     void testSnippet(String source) throws Exception {
         var p = Paths.get(System.getProperty("test.src", ".")).toAbsolutePath();
         while ((p = p.getParent()) != null) {
@@ -52,9 +53,14 @@ void testSnippet(String source) throws Exception {
                     var compilationUnits = fileManager.getJavaFileObjectsFromFiles(List.of(src));
                     fileManager.setLocation(StandardLocation.CLASS_OUTPUT,
                             List.of(Paths.get(System.getProperty("test.classes", ".")).toFile()));
-                    var task = compiler.getTask(null, fileManager, null, List.of(
-                            "--enable-preview",
-                            "--source", String.valueOf(Runtime.version().feature())),
+                    List<String> flags = List.of(
+                            "--source", String.valueOf(Runtime.version().feature()));
+                    if (source.contains("jdk/internal/classfile/components")) {
+                        flags = new ArrayList<>(flags);
+                        flags.add("--add-exports");
+                        flags.add("java.base/jdk.internal.classfile.components=ALL-UNNAMED");
+                    }
+                    var task = compiler.getTask(null, fileManager, null, flags,
                             null, compilationUnits);
                     if (task.call()) return;
                     throw new RuntimeException("Error compiling " + source);
diff --git a/test/jdk/jdk/classfile/StackMapsTest.java b/test/jdk/jdk/classfile/StackMapsTest.java
index 857299f4ecd..b2f94596622 100644
--- a/test/jdk/jdk/classfile/StackMapsTest.java
+++ b/test/jdk/jdk/classfile/StackMapsTest.java
@@ -33,7 +33,7 @@
 import java.lang.classfile.attribute.CodeAttribute;
 import java.lang.classfile.attribute.StackMapFrameInfo;
 import java.lang.classfile.attribute.StackMapTableAttribute;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.MethodTypeDesc;
diff --git a/test/jdk/jdk/classfile/StackTrackerTest.java b/test/jdk/jdk/classfile/StackTrackerTest.java
index b4e82ab0c4b..7d25c9e2ab9 100644
--- a/test/jdk/jdk/classfile/StackTrackerTest.java
+++ b/test/jdk/jdk/classfile/StackTrackerTest.java
@@ -31,7 +31,7 @@
 import java.lang.constant.MethodTypeDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.classfile.*;
-import java.lang.classfile.components.CodeStackTracker;
+import jdk.internal.classfile.components.CodeStackTracker;
 import static java.lang.classfile.TypeKind.*;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/test/jdk/jdk/classfile/TEST.properties b/test/jdk/jdk/classfile/TEST.properties
index 756e08b7b93..296312b258f 100644
--- a/test/jdk/jdk/classfile/TEST.properties
+++ b/test/jdk/jdk/classfile/TEST.properties
@@ -1,6 +1,7 @@
 maxOutputSize = 2500000
 enablePreview = true
 modules = \
+    java.base/jdk.internal.classfile.components \
     java.base/jdk.internal.classfile.impl \
     java.base/jdk.internal.classfile.impl.verifier \
     java.base/jdk.internal.org.objectweb.asm \
diff --git a/test/jdk/jdk/classfile/VerifierSelfTest.java b/test/jdk/jdk/classfile/VerifierSelfTest.java
index 1f9f199a33b..bc4ad5ab4ef 100644
--- a/test/jdk/jdk/classfile/VerifierSelfTest.java
+++ b/test/jdk/jdk/classfile/VerifierSelfTest.java
@@ -48,7 +48,7 @@
 import java.util.stream.Stream;
 import java.lang.classfile.*;
 import java.lang.classfile.attribute.*;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 import java.lang.classfile.constantpool.Utf8Entry;
 import java.lang.constant.ModuleDesc;
 
diff --git a/test/jdk/jdk/classfile/examples/AnnotationsExamples.java b/test/jdk/jdk/classfile/examples/AnnotationsExamples.java
index a43ab72556e..dfec144bbab 100644
--- a/test/jdk/jdk/classfile/examples/AnnotationsExamples.java
+++ b/test/jdk/jdk/classfile/examples/AnnotationsExamples.java
@@ -39,7 +39,7 @@
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 
 public class AnnotationsExamples {
 
diff --git a/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java b/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
index b0e1d6c312d..895c04704cc 100644
--- a/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
+++ b/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
@@ -32,7 +32,7 @@
 import java.lang.classfile.instruction.*;
 import java.lang.constant.ModuleDesc;
 import java.lang.constant.PackageDesc;
-import java.lang.classfile.components.CodeStackTracker;
+import jdk.internal.classfile.components.CodeStackTracker;
 
 class RebuildingTransformation {
 
diff --git a/test/jdk/jdk/classfile/helpers/Transforms.java b/test/jdk/jdk/classfile/helpers/Transforms.java
index c385fe61663..b0e88bd8212 100644
--- a/test/jdk/jdk/classfile/helpers/Transforms.java
+++ b/test/jdk/jdk/classfile/helpers/Transforms.java
@@ -22,7 +22,6 @@
  */
 package helpers;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -43,7 +42,7 @@
 import java.lang.classfile.CodeTransform;
 import java.lang.classfile.MethodModel;
 import java.lang.classfile.MethodTransform;
-import java.lang.classfile.components.ClassRemapper;
+import jdk.internal.classfile.components.ClassRemapper;
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
 import jdk.internal.org.objectweb.asm.Attribute;
 import jdk.internal.org.objectweb.asm.ClassReader;
diff --git a/test/jdk/jdk/internal/ref/Cleaner/CleanableListTest.java b/test/jdk/jdk/internal/ref/Cleaner/CleanableListTest.java
new file mode 100644
index 00000000000..eedd21d3f53
--- /dev/null
+++ b/test/jdk/jdk/internal/ref/Cleaner/CleanableListTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8343704
+ * @key randomness
+ * @library /test/lib
+ * @compile/module=java.base jdk/internal/ref/CleanableListTestHelper.java jdk/internal/ref/TestCleanable.java
+ * @modules java.base/jdk.internal.ref
+ * @run testng/othervm CleanableListTest
+ */
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+import java.util.Random;
+
+import jdk.internal.ref.CleanableListTestHelper;
+import jdk.internal.ref.TestCleanable;
+import jdk.test.lib.RandomFactory;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.testng.annotations.Ignore;
+
+public class CleanableListTest {
+
+    static final int SINGLE_NODE_CAPACITY = CleanableListTestHelper.NODE_CAPACITY;
+    static final int MULTI_NODE_CAPACITY = CleanableListTestHelper.NODE_CAPACITY * 4;
+
+    static final Random RND = RandomFactory.getRandom();
+    static final int RANDOM_ITERATIONS = 10_000_000;
+
+    @Test
+    public void testSingle() {
+        CleanableListTestHelper list = new CleanableListTestHelper();
+        Assert.assertTrue(list.isEmpty());
+        TestCleanable tc = list.newCleanable();
+        Assert.assertFalse(list.isEmpty());
+        Assert.assertTrue(list.remove(tc));
+        Assert.assertTrue(list.isEmpty());
+        Assert.assertFalse(list.remove(tc));
+    }
+
+    @Test
+    public void testSequential_Single() {
+        doSequential(SINGLE_NODE_CAPACITY);
+    }
+
+    @Test
+    public void testSequential_Multi() {
+        doSequential(MULTI_NODE_CAPACITY);
+    }
+
+    private void doSequential(int size) {
+        CleanableListTestHelper list = new CleanableListTestHelper();
+        Assert.assertTrue(list.isEmpty());
+
+        List<TestCleanable> tcs = new ArrayList<>();
+        for (int c = 0; c < size; c++) {
+            tcs.add(list.newCleanable());
+        }
+        Assert.assertFalse(list.isEmpty());
+
+        for (TestCleanable tc : tcs) {
+            Assert.assertTrue(list.remove(tc));
+        }
+        Assert.assertTrue(list.isEmpty());
+    }
+
+    @Test
+    public void testRandom_Single() {
+        doRandom(SINGLE_NODE_CAPACITY);
+    }
+
+    @Test
+    public void testRandom_Multi() {
+        doRandom(MULTI_NODE_CAPACITY);
+    }
+
+    private void doRandom(int size) {
+        CleanableListTestHelper list = new CleanableListTestHelper();
+        Assert.assertTrue(list.isEmpty());
+
+        BitSet bs = new BitSet(size);
+
+        List<TestCleanable> tcs = new ArrayList<>();
+        for (int c = 0; c < size; c++) {
+            tcs.add(list.newCleanable());
+            bs.set(c, true);
+        }
+        Assert.assertFalse(list.isEmpty());
+
+        for (int t = 0; t < RANDOM_ITERATIONS; t++) {
+            int idx = RND.nextInt(size);
+            TestCleanable tc = tcs.get(idx);
+            if (bs.get(idx)) {
+                Assert.assertTrue(list.remove(tc));
+                bs.set(idx, false);
+            } else {
+                Assert.assertFalse(list.remove(tc));
+                list.insert(tc);
+                bs.set(idx, true);
+            }
+        }
+
+        for (int c = 0; c < size; c++) {
+            if (bs.get(c)) {
+                TestCleanable tc = tcs.get(c);
+                Assert.assertTrue(list.remove(tc));
+            }
+        }
+    }
+
+}
diff --git a/test/jdk/jdk/internal/ref/Cleaner/java.base/jdk/internal/ref/CleanableListTestHelper.java b/test/jdk/jdk/internal/ref/Cleaner/java.base/jdk/internal/ref/CleanableListTestHelper.java
new file mode 100644
index 00000000000..d3ee187a097
--- /dev/null
+++ b/test/jdk/jdk/internal/ref/Cleaner/java.base/jdk/internal/ref/CleanableListTestHelper.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.ref;
+
+import java.lang.ref.Cleaner;
+import jdk.internal.ref.PhantomCleanable;
+import jdk.internal.ref.CleanerImpl;
+import jdk.internal.ref.CleanerImpl.CleanableList;
+
+/**
+ * This class provides package-private access to CleanableList internals.
+ */
+public class CleanableListTestHelper {
+
+    public static final int NODE_CAPACITY = CleanableList.NODE_CAPACITY;
+
+    final Cleaner cleaner;
+    final CleanableList list;
+
+    public CleanableListTestHelper() {
+        cleaner = Cleaner.create();
+        list = CleanerImpl.getCleanerImpl(cleaner).activeList;
+
+        // List contains CleanerCleanable for Cleaner itself.
+        // For testing empty list paths, we want to drop it.
+        list.reset();
+    }
+
+    public TestCleanable newCleanable() {
+        return new TestCleanable(cleaner);
+    }
+
+    public void insert(PhantomCleanable cl) {
+        list.insert(cl);
+    }
+
+    public boolean remove(PhantomCleanable cl) {
+        return list.remove(cl);
+    }
+
+    public boolean isEmpty() {
+        return list.isEmpty();
+    }
+
+}
diff --git a/src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java b/test/jdk/jdk/internal/ref/Cleaner/java.base/jdk/internal/ref/TestCleanable.java
similarity index 56%
rename from src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java
rename to test/jdk/jdk/internal/ref/Cleaner/java.base/jdk/internal/ref/TestCleanable.java
index 2628c4ac2a3..9e8da6f4830 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java
+++ b/test/jdk/jdk/internal/ref/Cleaner/java.base/jdk/internal/ref/TestCleanable.java
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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
@@ -23,24 +21,19 @@
  * questions.
  */
 
-package com.sun.jmx.mbeanserver;
+package jdk.internal.ref;
 
-import java.security.PrivilegedAction;
+import java.lang.ref.Cleaner;
 
-/**
- * Utility class to be used by the method {@code AccessControler.doPrivileged}
- * to get a system property.
- *
- * @since 1.5
- */
-public class GetPropertyAction implements PrivilegedAction<String> {
-    private final String key;
+public class TestCleanable extends PhantomCleanable<Object> {
+    static final Object TARGET = new Object();
 
-    public GetPropertyAction(String key) {
-        this.key = key;
+    public TestCleanable(Cleaner cleaner) {
+        super(TARGET, cleaner);
     }
 
-    public String run() {
-        return System.getProperty(key);
+    @Override
+    protected void performCleanup() {
+        // no action
     }
 }
diff --git a/test/jdk/sun/security/provider/acvp/Launcher.java b/test/jdk/sun/security/provider/acvp/Launcher.java
index b5c5908a902..356453292c1 100644
--- a/test/jdk/sun/security/provider/acvp/Launcher.java
+++ b/test/jdk/sun/security/provider/acvp/Launcher.java
@@ -32,6 +32,7 @@
  * @test
  * @bug 8342442 8345057
  * @library /test/lib
+ * @modules java.base/sun.security.provider
  */
 
 /// This test runs on `internalProjection.json`-style files generated
diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
index 87bd304518f..657c01e4aa8 100644
--- a/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
+++ b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
@@ -23,6 +23,7 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.json.JSONValue;
 import jdk.test.lib.security.FixedSecureRandom;
+import sun.security.provider.ML_DSA_Impls;
 
 import java.security.*;
 import java.security.spec.EncodedKeySpec;
@@ -34,6 +35,11 @@
 public class ML_DSA_Test {
 
     public static void run(JSONValue kat, Provider provider) throws Exception {
+
+        // We only have ML-DSA test for internal functions, which
+        // is equivalent to the FIP 204 draft.
+        ML_DSA_Impls.version = ML_DSA_Impls.Version.DRAFT;
+
         var mode = kat.get("mode").asString();
         switch (mode) {
             case "keyGen" -> keyGenTest(kat, provider);
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
index 4757f54fdfd..fff08d35410 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
@@ -56,7 +56,12 @@ private String getString(String key) {
     }
 
     private String getFormattedString(String key, Object[] args) {
-        return MessageFormat.format(getString(key), args);
+        var str = getString(key);
+        if (args.length != 0) {
+            return MessageFormat.format(str, args);
+        } else {
+            return str;
+        }
     }
 
     public CannedFormattedString cannedFormattedString(String key, String ... args) {
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index ed7338a76dd..c14da0da0f0 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -31,7 +31,10 @@
 import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageStringBundle;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.RunnablePackageTest;
 import jdk.jpackage.test.TKit;
+import static jdk.internal.util.OperatingSystem.WINDOWS;
 
 /*
  * @test
@@ -113,14 +116,9 @@ public static Collection input() {
     public static void test(String javaAppDesc, String[] jpackageArgs,
             String[] removeArgs, CannedFormattedString... expectedErrors) {
         // Init default jpackage test command line.
-        var cmd = JPackageCommand.helloAppImage(javaAppDesc)
-                // Disable default logic adding `--verbose` option
-                // to jpackage command line.
-                // It will affect jpackage error messages if the command line is malformed.
-                .ignoreDefaultVerbose(true)
-                // Ignore external runtime as it will interfer
-                // with jpackage arguments in this test.
-                .ignoreDefaultRuntime(true);
+        var cmd = JPackageCommand.helloAppImage(javaAppDesc);
+
+        defaultInit(cmd, expectedErrors);
 
         // Add arguments if requested.
         Optional.ofNullable(jpackageArgs).ifPresent(cmd::addArguments);
@@ -129,13 +127,42 @@ public static void test(String javaAppDesc, String[] jpackageArgs,
         Optional.ofNullable(removeArgs).map(List::of).ifPresent(
                 args -> args.forEach(cmd::removeArgumentWithValue));
 
+        cmd.execute(1);
+    }
+
+    @Test(ifOS = WINDOWS)
+    public static void testWinService() {
+
+        CannedFormattedString[] expectedErrors = new CannedFormattedString[] {
+            JPackageStringBundle.MAIN.cannedFormattedString("error.missing-service-installer"),
+            JPackageStringBundle.MAIN.cannedFormattedString("error.missing-service-installer.advice")
+        };
+
+        new PackageTest().configureHelloApp()
+                .addInitializer(cmd -> {
+                    defaultInit(cmd, expectedErrors);
+                    cmd.addArgument("--launcher-as-service");
+                })
+                .setExpectedExitCode(1)
+                .run(RunnablePackageTest.Action.CREATE);
+    }
+
+    private static void defaultInit(JPackageCommand cmd, CannedFormattedString... expectedErrors) {
+
+        // Disable default logic adding `--verbose` option
+        // to jpackage command line.
+        // It will affect jpackage error messages if the command line is malformed.
+        cmd.ignoreDefaultVerbose(true);
+
+        // Ignore external runtime as it will interfer
+        // with jpackage arguments in this test.
+        cmd.ignoreDefaultRuntime(true);
+
         // Configure jpackage output verifier to look up the list of provided
-        // errors in the order they specified.
+        // errors in the order they are specified.
         cmd.validateOutput(Stream.of(expectedErrors)
                 .map(CannedFormattedString::getValue)
                 .map(TKit::assertTextStream)
                 .reduce(TKit.TextStreamVerifier::andThen).get());
-
-        cmd.execute(1);
     }
 }
diff --git a/test/langtools/jdk/jshell/StartupWithFormatSpecifierTest.java b/test/langtools/jdk/jshell/StartupWithFormatSpecifierTest.java
new file mode 100644
index 00000000000..b0695ae8636
--- /dev/null
+++ b/test/langtools/jdk/jshell/StartupWithFormatSpecifierTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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 8341495
+ * @summary Test for crash caused by format specifier in startup script
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jshell/jdk.internal.jshell.tool
+ * @library /tools/lib
+ * @build toolbox.ToolBox
+ * @build KullaTesting Compiler
+ * @run testng StartupWithFormatSpecifierTest
+ */
+
+import java.nio.file.Path;
+
+import org.testng.annotations.Test;
+
+@Test
+public class StartupWithFormatSpecifierTest extends ReplToolTesting {
+
+    public void testStartupWithFormatSpecifier() {
+        Compiler compiler = new Compiler();
+        String startupScript = "String.format(\"This is a %s.\", \"test\");";
+        Path startupFile = compiler.getPath("StartupFileOption/startup.txt");
+        compiler.writeToFile(startupFile, startupScript);
+        test(new String[] { "--startup", startupFile.toString() },
+                (a) -> assertCommandOutputContains(a, "/set start", startupScript)
+        );
+    }
+}
diff --git a/test/jdk/javax/naming/InitialContext/NoApplet.java b/test/langtools/tools/javac/SuperInit/EarlyLambdaReturn.java
similarity index 61%
rename from test/jdk/javax/naming/InitialContext/NoApplet.java
rename to test/langtools/tools/javac/SuperInit/EarlyLambdaReturn.java
index 8b4e59de82c..fd63f4c1a3b 100644
--- a/test/jdk/javax/naming/InitialContext/NoApplet.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLambdaReturn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, 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
@@ -20,22 +20,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
-/* @test
- * @bug 8004502
- * @summary Sanity check that specifying the APPLET property when creating an
- *   InitialContext behaves as expected when java.awt.Applet is not present
+/*
+ * @test
+ * @bug 8345438
+ * @summary Verify 'return' allowed in a lambda declared in an early construction context
+ * @enablePreview
  */
+public class EarlyLambdaReturn {
 
-import javax.naming.*;
-import java.util.Hashtable;
+    public EarlyLambdaReturn() {
+        Runnable r = () -> {
+            return;
+        };
+        super();
+        r.run();
+    }
 
-public class NoApplet {
-    @SuppressWarnings("deprecation")
-    public static void main(String[] args) throws NamingException {
-        Hashtable<Object,Object> env = new Hashtable<>();
-        env.put(Context.APPLET, new Object());
-        Context ctxt = new InitialContext(env);
-        ctxt.close();
+    public static void main(String[] args) {
+        new EarlyLambdaReturn();
     }
 }
diff --git a/test/langtools/tools/javac/SuperInit/SuperInitFails.java b/test/langtools/tools/javac/SuperInit/SuperInitFails.java
index b3dd88fc242..feb5b81c1b0 100644
--- a/test/langtools/tools/javac/SuperInit/SuperInitFails.java
+++ b/test/langtools/tools/javac/SuperInit/SuperInitFails.java
@@ -186,4 +186,27 @@ public SuperInitFails(double[][] x) {
         Runnable r = () -> this.x = 7;  // this should FAIL
         super();
     }
+
+    public static class Inner4 {
+        Inner4() {
+            Runnable r = () -> {
+                class A {
+                    A() {
+                        return;         // this should FAIL
+                        super();
+                    }
+                    A(int x) {
+                        {
+                            this();     // this should FAIL
+                        }
+                    }
+                    A(char x) {
+                        super();
+                        this();         // this should FAIL
+                    }
+                }
+            };
+            super();
+        };
+    }
 }
diff --git a/test/langtools/tools/javac/SuperInit/SuperInitFails.out b/test/langtools/tools/javac/SuperInit/SuperInitFails.out
index c6b726ab173..a6cabb6f5ed 100644
--- a/test/langtools/tools/javac/SuperInit/SuperInitFails.out
+++ b/test/langtools/tools/javac/SuperInit/SuperInitFails.out
@@ -19,6 +19,9 @@ SuperInitFails.java:172:17: compiler.err.cant.ref.before.ctor.called: x
 SuperInitFails.java:176:24: compiler.err.cant.ref.before.ctor.called: x
 SuperInitFails.java:180:18: compiler.err.cant.ref.before.ctor.called: x
 SuperInitFails.java:186:28: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:195:25: compiler.err.return.before.superclass.initialized
+SuperInitFails.java:200:33: compiler.err.ctor.calls.not.allowed.here
+SuperInitFails.java:205:29: compiler.err.redundant.superclass.init
 SuperInitFails.java:33:13: compiler.err.call.must.only.appear.in.ctor
 SuperInitFails.java:37:14: compiler.err.call.must.only.appear.in.ctor
 SuperInitFails.java:41:14: compiler.err.call.must.only.appear.in.ctor
@@ -27,7 +30,7 @@ SuperInitFails.java:49:33: compiler.err.call.must.only.appear.in.ctor
 SuperInitFails.java:53:32: compiler.err.call.must.only.appear.in.ctor
 SuperInitFails.java:83:18: compiler.err.ctor.calls.not.allowed.here
 SuperInitFails.java:89:13: compiler.err.return.before.superclass.initialized
-SuperInitFails.java:150:18: compiler.err.ctor.calls.not.allowed.here
+SuperInitFails.java:150:18: compiler.err.call.must.only.appear.in.ctor
 - compiler.note.preview.filename: SuperInitFails.java, DEFAULT
 - compiler.note.preview.recompile
-30 errors
+33 errors
diff --git a/test/langtools/tools/javac/SuperInit/SuperInitGood.java b/test/langtools/tools/javac/SuperInit/SuperInitGood.java
index 68002e8d37e..1d0e928a0d0 100644
--- a/test/langtools/tools/javac/SuperInit/SuperInitGood.java
+++ b/test/langtools/tools/javac/SuperInit/SuperInitGood.java
@@ -454,6 +454,41 @@ public void bar() {
         }
     }
 
+    // Lambdas within constructors
+    public static class Test22 {
+        public Test22() {
+            Runnable r = () -> System.out.println();
+            super();
+            r.run();
+        }
+        public Test22(int x) {
+            Runnable r = () -> System.out.println();
+            r.run();
+            super();
+        }
+        public Test22(char x) {
+            Runnable r = () -> {
+                class A {
+                    A() {
+                        return;
+                    }
+                    A(int x) {
+                        Runnable r2 = () -> {
+                            return;
+                        };
+                        this();
+                        r2.run();
+                    }
+                    A(char x) {
+                        this(0);
+                    }
+                }
+                return;
+            };
+            r.run();
+            super();
+        }
+    }
 
     public static void main(String[] args) {
         new Test0();
@@ -499,5 +534,6 @@ public static void main(String[] args) {
         new Test20(123);
         new Test21((int)123);
         new Test21((float)123);
+        new Test22('x');
     }
 }
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index e158366a171..39bcec33654 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -34,7 +34,6 @@ compiler.err.proc.bad.config.file                       # JavacProcessingEnviron
 compiler.err.proc.cant.access                           # completion failure
 compiler.err.proc.cant.access.1                         # completion failure, no stack trace
 compiler.err.proc.cant.create.loader                    # security exception from service loader
-compiler.err.proc.no.service                            # JavacProcessingEnvironment: no service loader available
 compiler.err.proc.processor.bad.option.name             # cannot happen? masked by javac.err.invalid.A.key
 compiler.err.proc.service.problem                       # JavacProcessingEnvironment: catch Throwable from service loader
 compiler.err.proc.cant.load.class                       # JavacProcessingEnvironment: cant load the class/jar file
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaSecurityAccess.java b/test/langtools/tools/javac/patterns/T8345474.java
similarity index 52%
rename from src/java.base/share/classes/jdk/internal/access/JavaSecurityAccess.java
rename to test/langtools/tools/javac/patterns/T8345474.java
index fa8e603ac23..68a0c88a501 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaSecurityAccess.java
+++ b/test/langtools/tools/javac/patterns/T8345474.java
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 2010, 2024, 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,18 +20,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+/*
+ * @test
+ * @bug 8345474
+ * @summary Translation for instanceof is not triggered when patterns are not used in the compilation unit
+ * @enablePreview
+ * @compile T8345474.java
+ * @run main T8345474
+ */
+import java.util.List;
 
-package jdk.internal.access;
-
-import java.security.AccessControlContext;
-import java.security.PrivilegedAction;
+public class T8345474 {
+    public static void main(String[] args) {
+        erasureInstanceofTypeComparisonOperator();
+    }
 
-public interface JavaSecurityAccess {
+    public static void erasureInstanceofTypeComparisonOperator() {
+        List<Short> ls = List.of((short) 42);
 
-    <T> T doIntersectionPrivilege(PrivilegedAction<T> action,
-                                  @SuppressWarnings("removal") AccessControlContext stack,
-                                  @SuppressWarnings("removal") AccessControlContext context);
+        assertTrue(ls.get(0) instanceof int);
+    }
 
-    <T> T doIntersectionPrivilege(PrivilegedAction<T> action,
-                                  @SuppressWarnings("removal") AccessControlContext context);
+    static void assertTrue(boolean actual) {
+        if (!actual) {
+            throw new AssertionError("Expected: true, but got false");
+        }
+    }
 }
diff --git a/test/langtools/tools/javac/preview/PreviewTest.java b/test/langtools/tools/javac/preview/PreviewTest.java
index 24cb3d57dde..ad67ef8ac87 100644
--- a/test/langtools/tools/javac/preview/PreviewTest.java
+++ b/test/langtools/tools/javac/preview/PreviewTest.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8282823
+ * @bug 8282823 8343540
  * @library /tools/lib
  * @enablePreview
  * @modules
@@ -229,13 +229,13 @@ public default void test() {}
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected =
-                List.of("IUseIntf2P.java:3:8: compiler.err.is.preview: test()",
-                        "IUseIntfDef2P.java:3:8: compiler.err.is.preview: test()",
+                List.of("IUseIntf2P.java:4:25: compiler.err.is.preview: test()",
+                        "IUseIntfDef2P.java:4:25: compiler.err.is.preview: test()",
                         "UseClass2P.java:4:17: compiler.err.is.preview: test()",
-                        "UseIntf2P.java:3:8: compiler.err.is.preview: test()",
-                        "UseIntfDef2P.java:3:8: compiler.err.is.preview: test()",
+                        "UseIntf2P.java:4:17: compiler.err.is.preview: test()",
+                        "UseIntfDef2P.java:4:17: compiler.err.is.preview: test()",
                         "UseSubClass12P.java:3:17: compiler.err.is.preview: test()",
-                        "UseSubIntfDef12P.java:2:8: compiler.err.is.preview: test()",
+                        "UseSubIntfDef12P.java:3:17: compiler.err.is.preview: test()",
                         "7 errors");
 
         if (!log.equals(expected))
@@ -257,13 +257,13 @@ public default void test() {}
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         expected =
-                List.of("IUseIntf2P.java:3:8: compiler.warn.is.preview: test()",
-                        "IUseIntfDef2P.java:3:8: compiler.warn.is.preview: test()",
+                List.of("IUseIntf2P.java:4:25: compiler.warn.is.preview: test()",
+                        "IUseIntfDef2P.java:4:25: compiler.warn.is.preview: test()",
                         "UseClass2P.java:4:17: compiler.warn.is.preview: test()",
-                        "UseIntf2P.java:3:8: compiler.warn.is.preview: test()",
-                        "UseIntfDef2P.java:3:8: compiler.warn.is.preview: test()",
+                        "UseIntf2P.java:4:17: compiler.warn.is.preview: test()",
+                        "UseIntfDef2P.java:4:17: compiler.warn.is.preview: test()",
                         "UseSubClass12P.java:3:17: compiler.warn.is.preview: test()",
-                        "UseSubIntfDef12P.java:2:8: compiler.warn.is.preview: test()",
+                        "UseSubIntfDef12P.java:3:17: compiler.warn.is.preview: test()",
                         "7 warnings");
 
         if (!log.equals(expected))
@@ -392,7 +392,7 @@ public void test() {}
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected =
-                List.of("AbstractP.java:3:17: compiler.err.is.preview: test()",
+                List.of("AbstractP.java:4:26: compiler.err.is.preview: test()",
                         "ReabstractP.java:4:26: compiler.err.is.preview: test()",
                         "2 errors");
 
@@ -415,7 +415,7 @@ public void test() {}
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         expected =
-                List.of("AbstractP.java:3:17: compiler.warn.is.preview: test()",
+                List.of("AbstractP.java:4:26: compiler.warn.is.preview: test()",
                         "ReabstractP.java:4:26: compiler.warn.is.preview: test()",
                         "2 warnings");
 
@@ -463,6 +463,413 @@ public void test() {}
         }
     }
 
+    @Test //JDK-8343540:
+    public void nonPreviewImplementsPreview(Path base) throws Exception {
+        Path apiSrc = base.resolve("api-src");
+        tb.writeJavaFiles(apiSrc,
+                          """
+                          package preview.api;
+                          @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.TEST)
+                          public interface Preview {
+                              public static final int FIELD = 0;
+                              public default void test() {}
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.TEST,
+                                                             reflective=true)
+                          public interface ReflectivePreview {
+                              public default void test() {}
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public interface NonPreviewIntf extends Preview {
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public class NonPreview implements Preview {
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public class ReflectiveNonPreview implements ReflectivePreview {
+                          }
+                          """);
+        Path apiClasses = base.resolve("api-classes");
+
+        new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(apiClasses)
+                .options("--patch-module", "java.base=" + apiSrc.toString(),
+                         "-Werror")
+                .files(tb.findJavaFiles(apiSrc))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        Path testSrc = base.resolve("test-src");
+        tb.writeJavaFiles(testSrc,
+                          """
+                          package test;
+                          import preview.api.NonPreview;
+                          import preview.api.NonPreviewIntf;
+                          import preview.api.Preview;
+                          import preview.api.ReflectiveNonPreview;
+                          public class Test {
+                              public void test(NonPreview np,
+                                               Produce<? extends NonPreview> prod) {
+                                  np.test();
+                                  acceptRunnable(np::test);
+                                  accept(NonPreview::test);
+                                  prod.produce().test();
+                                  acceptRunnable(prod.produce()::test);
+                                  int i = np.FIELD;
+                              }
+                              public <T1 extends NonPreview,
+                                      T2 extends Test & NonPreviewIntf,
+                                      T3 extends T2> void test(T1 t1, T2 t2, T3 t3) {
+                                  t1.test();
+                                  t2.test();
+                                  t3.test();
+                              }
+                              public void test(ReflectiveNonPreview np) {
+                                  np.test();
+                              }
+                              public void test(Preview p) {
+                                  p.test();
+                                  acceptRunnable(p::test);
+                                  accept(Preview::test);
+                              }
+                              private static class ExtendsNonPreview extends NonPreview {
+                                  public void test() {} //error/warning here:
+                              }
+                              private static class ImplementsPreview implements Preview {
+                                  //no error/warning (already was on Preview after implements)
+                                  public void test() {}
+                              }
+                              private static class ImplicitReceiver extends NonPreview {
+                                  public void g() {
+                                      test(); //implicit this - error/warning
+                                      int i = FIELD; //implicit this - error/warning
+                                  }
+                              }
+                              private void acceptRunnable(Runnable r) {}
+                              private void accept(Accept<NonPreview> accept) {}
+                              interface Accept<T> {
+                                  public void accept(T t);
+                              }
+                              interface Produce<T> {
+                                  public T produce();
+                              }
+                          }
+                          """);
+        Path testClasses = base.resolve("test-classes");
+        List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(testClasses)
+                .options("--patch-module", "java.base=" + apiClasses.toString(),
+                         "--add-exports", "java.base/preview.api=ALL-UNNAMED",
+                         "-XDrawDiagnostics")
+                .files(tb.findJavaFiles(testSrc))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected =
+                List.of("Test.java:4:19: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:26:22: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:34:55: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:9:11: compiler.err.is.preview: test()",
+                        "Test.java:10:24: compiler.err.is.preview: test()",
+                        "Test.java:11:16: compiler.err.is.preview: test()",
+                        "Test.java:12:23: compiler.err.is.preview: test()",
+                        "Test.java:13:24: compiler.err.is.preview: test()",
+                        "Test.java:14:19: compiler.err.is.preview: FIELD",
+                        "Test.java:19:11: compiler.err.is.preview: test()",
+                        "Test.java:20:11: compiler.err.is.preview: test()",
+                        "Test.java:21:11: compiler.err.is.preview: test()",
+                        "Test.java:24:11: compiler.warn.is.preview.reflective: test()",
+                        "Test.java:29:16: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:32:21: compiler.err.is.preview: test()",
+                        "Test.java:36:21: compiler.err.is.preview: test()",
+                        "Test.java:40:13: compiler.err.is.preview: test()",
+                        "Test.java:41:21: compiler.err.is.preview: FIELD",
+                        "17 errors",
+                        "1 warning");
+
+        if (!log.equals(expected))
+            throw new Exception("expected output not found" + log);
+    }
+
+    @Test //JDK-8343540:
+    public void nonPreviewImplementsPreview2(Path base) throws Exception {
+        Path apiSrc = base.resolve("api-src");
+        tb.writeJavaFiles(apiSrc,
+                          """
+                          package preview.api;
+                          @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.TEST)
+                          public interface Preview {
+                              public default void test() {}
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public interface NonPreviewIntf extends Preview {
+                              public default void test() {}
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public class NonPreview implements Preview {
+                              public void test() {}
+                          }
+                          """);
+        Path apiClasses = base.resolve("api-classes");
+
+        new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(apiClasses)
+                .options("--patch-module", "java.base=" + apiSrc.toString(),
+                         "-Werror")
+                .files(tb.findJavaFiles(apiSrc))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        Path testSrc = base.resolve("test-src");
+        tb.writeJavaFiles(testSrc,
+                          """
+                          package test;
+                          import preview.api.NonPreview;
+                          import preview.api.NonPreviewIntf;
+                          public class Test {
+                              public void test(NonPreview np1,
+                                               NonPreviewIntf np2) {
+                                  np1.test();
+                                  np2.test();
+                              }
+                          }
+                          """);
+        Path testClasses = base.resolve("test-classes");
+        List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(testClasses)
+                .options("--patch-module", "java.base=" + apiClasses.toString(),
+                         "--add-exports", "java.base/preview.api=ALL-UNNAMED",
+                         "-XDrawDiagnostics")
+                .files(tb.findJavaFiles(testSrc))
+                .run(Task.Expect.SUCCESS)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+    }
+
+    @Test //JDK-8343540:
+    public void nonPreviewImplementsPreview3(Path base) throws Exception {
+        Path apiSrc = base.resolve("api-src");
+        tb.writeJavaFiles(apiSrc,
+                          """
+                          package preview.api;
+                          @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.TEST)
+                          public class Preview {
+                              public int field;
+                              public static void test() {}
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public class NonPreview extends Preview {
+                          }
+                          """);
+        Path apiClasses = base.resolve("api-classes");
+
+        new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(apiClasses)
+                .options("--patch-module", "java.base=" + apiSrc.toString(),
+                         "-Werror")
+                .files(tb.findJavaFiles(apiSrc))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        Path testSrc = base.resolve("test-src");
+        tb.writeJavaFiles(testSrc,
+                          """
+                          package test;
+                          import preview.api.NonPreview;
+                          import preview.api.Preview;
+                          public class Test {
+                              public void test(NonPreview np, Preview p) {
+                                  NonPreview.test();
+                                  Preview.test();
+                                  int i1 = np.field;
+                                  int i2 = p.field;
+                              }
+                          }
+                          """);
+        Path testClasses = base.resolve("test-classes");
+        List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(testClasses)
+                .options("--patch-module", "java.base=" + apiClasses.toString(),
+                         "--add-exports", "java.base/preview.api=ALL-UNNAMED",
+                         "-XDrawDiagnostics")
+                .files(tb.findJavaFiles(testSrc))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected =
+                List.of("Test.java:3:19: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:5:37: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:6:19: compiler.err.is.preview: test()",
+                        "Test.java:7:9: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:8:20: compiler.err.is.preview: field",
+                        "5 errors");
+
+        if (!log.equals(expected))
+            throw new Exception("expected output not found" + log);
+    }
+
+    @Test //JDK-8343540:
+    public void nonPreviewImplementsPreview4(Path base) throws Exception {
+        Path apiSrc = base.resolve("api-src");
+        tb.writeJavaFiles(apiSrc,
+                          """
+                          package preview.api;
+                          @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.TEST)
+                          public class Preview {
+                              public int field;
+                              public static void test() {}
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public class NonPreview extends Preview {
+                              public int field;
+                              public static void test() {}
+                          }
+                          """);
+        Path apiClasses = base.resolve("api-classes");
+
+        new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(apiClasses)
+                .options("--patch-module", "java.base=" + apiSrc.toString(),
+                         "-Werror")
+                .files(tb.findJavaFiles(apiSrc))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        Path testSrc = base.resolve("test-src");
+        tb.writeJavaFiles(testSrc,
+                          """
+                          package test;
+                          import preview.api.NonPreview;
+                          import preview.api.Preview;
+                          public class Test {
+                              public void test(NonPreview np, Preview p) {
+                                  NonPreview.test();
+                                  Preview.test();
+                                  int i1 = np.field;
+                                  int i2 = p.field;
+                              }
+                          }
+                          """);
+        Path testClasses = base.resolve("test-classes");
+        List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(testClasses)
+                .options("--patch-module", "java.base=" + apiClasses.toString(),
+                         "--add-exports", "java.base/preview.api=ALL-UNNAMED",
+                         "-XDrawDiagnostics")
+                .files(tb.findJavaFiles(testSrc))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected =
+                List.of("Test.java:3:19: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:5:37: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:7:9: compiler.err.is.preview: preview.api.Preview",
+                        "3 errors");
+
+        if (!log.equals(expected))
+            throw new Exception("expected output not found" + log);
+    }
+
+    @Test //JDK-8343540:
+    public void nonPreviewImplementsPreview5(Path base) throws Exception {
+        Path apiSrc = base.resolve("api-src");
+        tb.writeJavaFiles(apiSrc,
+                          """
+                          package preview.api;
+                          @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.TEST)
+                          public interface Preview {
+                              public static final int CONST1 = 0;
+                              public static final int CONST2 = 0;
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public interface NonPreviewIntf extends Preview {
+                              public static final int CONST2 = 0;
+                          }
+                          """,
+                          """
+                          package preview.api;
+                          public class NonPreview implements Preview {
+                              public static final int CONST2 = 0;
+                          }
+                          """);
+        Path apiClasses = base.resolve("api-classes");
+
+        new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(apiClasses)
+                .options("--patch-module", "java.base=" + apiSrc.toString(),
+                         "-Werror")
+                .files(tb.findJavaFiles(apiSrc))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        Path testSrc = base.resolve("test-src");
+        tb.writeJavaFiles(testSrc,
+                          """
+                          package test;
+                          import preview.api.NonPreview;
+                          import preview.api.NonPreviewIntf;
+                          import preview.api.Preview;
+                          public class Test {
+                              public void test() {
+                                  int i1 = NonPreview.CONST1;
+                                  int i2 = NonPreviewIntf.CONST1;
+                                  int i3 = Preview.CONST1;
+                                  int i4 = NonPreview.CONST2;
+                                  int i5 = NonPreviewIntf.CONST2;
+                                  int i6 = Preview.CONST2;
+                              }
+                          }
+                          """);
+        Path testClasses = base.resolve("test-classes");
+        List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(testClasses)
+                .options("--patch-module", "java.base=" + apiClasses.toString(),
+                         "--add-exports", "java.base/preview.api=ALL-UNNAMED",
+                         "-XDrawDiagnostics")
+                .files(tb.findJavaFiles(testSrc))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected =
+                List.of("Test.java:4:19: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:7:28: compiler.err.is.preview: CONST1",
+                        "Test.java:8:32: compiler.err.is.preview: CONST1",
+                        "Test.java:9:18: compiler.err.is.preview: preview.api.Preview",
+                        "Test.java:12:18: compiler.err.is.preview: preview.api.Preview",
+                        "5 errors");
+
+        if (!log.equals(expected))
+            throw new Exception("expected output not found" + log);
+    }
+
     private int verifyPreviewClassfiles(Path directory) throws Exception {
         Path[] classfiles = tb.findFiles("class", directory);
 
diff --git a/test/lib/jdk/test/lib/process/ProcessTools.java b/test/lib/jdk/test/lib/process/ProcessTools.java
index 6ab36c8bfd3..fd543d0c3b7 100644
--- a/test/lib/jdk/test/lib/process/ProcessTools.java
+++ b/test/lib/jdk/test/lib/process/ProcessTools.java
@@ -392,7 +392,7 @@ private static List<String> addTestThreadFactoryArgs(String testThreadFactoryNam
                 "--dry-run", "--list-modules","--validate-modules", "-m", "--module", "-version");
 
         final List<String> doubleWordArgs = List.of(
-                "--add-opens", "--upgrade-module-path", "--add-modules", "--add-exports",
+                "--add-opens", "--upgrade-module-path", "--add-modules", "--add-exports", "--enable-native-access",
                 "--limit-modules", "--add-reads", "--patch-module", "--module-path", "-p");
 
         ArrayList<String> args = new ArrayList<>();
diff --git a/test/micro/org/openjdk/bench/java/lang/DoubleBitConversion.java b/test/micro/org/openjdk/bench/java/lang/DoubleBitConversion.java
new file mode 100644
index 00000000000..7ef4bf9cc75
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/DoubleBitConversion.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.BitSet;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 3, time = 1)
+@Measurement(iterations = 3, time = 1)
+@Fork(3)
+public class DoubleBitConversion {
+
+    double doubleZero = 0;
+    double doubleOne = 1;
+    double doubleNan = Double.NaN;
+
+    long longDoubleZero = Double.doubleToLongBits(0);
+    long longDoubleOne = Double.doubleToLongBits(1);
+    long longDoubleNaN = Double.doubleToLongBits(Double.NaN);
+
+    @Benchmark
+    public long doubleToRawLongBits_zero() {
+        return Double.doubleToRawLongBits(doubleZero);
+    }
+
+    @Benchmark
+    public long doubleToRawLongBits_one() {
+        return Double.doubleToRawLongBits(doubleOne);
+    }
+
+    @Benchmark
+    public long doubleToRawLongBits_NaN() {
+        return Double.doubleToRawLongBits(doubleNan);
+    }
+
+    @Benchmark
+    public long doubleToLongBits_zero() {
+        return Double.doubleToLongBits(doubleZero);
+    }
+
+    @Benchmark
+    public long doubleToLongBits_one() {
+        return Double.doubleToLongBits(doubleOne);
+    }
+
+    @Benchmark
+    public long doubleToLongBits_NaN() {
+        return Double.doubleToLongBits(doubleNan);
+    }
+
+    @Benchmark
+    public double longBitsToDouble_zero() {
+        return Double.longBitsToDouble(longDoubleZero);
+    }
+
+    @Benchmark
+    public double longBitsToDouble_one() {
+        return Double.longBitsToDouble(longDoubleOne);
+    }
+
+    @Benchmark
+    public double longBitsToDouble_NaN() {
+        return Double.longBitsToDouble(longDoubleNaN);
+    }
+
+}
+
diff --git a/test/micro/org/openjdk/bench/java/lang/FloatBitConversion.java b/test/micro/org/openjdk/bench/java/lang/FloatBitConversion.java
new file mode 100644
index 00000000000..965e7b88cbb
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/FloatBitConversion.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.BitSet;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 3, time = 1)
+@Measurement(iterations = 3, time = 1)
+@Fork(3)
+public class FloatBitConversion {
+
+    float floatZero = 0;
+    float floatOne = 1;
+    float floatNan = Float.NaN;
+
+    int intFloatZero = Float.floatToIntBits(0);
+    int intFloatOne = Float.floatToIntBits(1);
+    int intFloatNaN = Float.floatToIntBits(Float.NaN);
+
+    @Benchmark
+    public int floatToRawIntBits_zero() {
+        return Float.floatToRawIntBits(floatZero);
+    }
+
+    @Benchmark
+    public int floatToRawIntBits_one() {
+        return Float.floatToRawIntBits(floatOne);
+    }
+
+    @Benchmark
+    public int floatToRawIntBits_NaN() {
+        return Float.floatToRawIntBits(floatNan);
+    }
+
+    @Benchmark
+    public int floatToIntBits_zero() {
+        return Float.floatToIntBits(floatZero);
+    }
+
+    @Benchmark
+    public int floatToIntBits_one() {
+        return Float.floatToIntBits(floatOne);
+    }
+
+    @Benchmark
+    public int floatToIntBits_NaN() {
+        return Float.floatToIntBits(floatNan);
+    }
+
+    @Benchmark
+    public float intBitsToFloat_zero() {
+        return Float.intBitsToFloat(intFloatZero);
+    }
+
+    @Benchmark
+    public float intBitsToFloat_one() {
+        return Float.intBitsToFloat(intFloatOne);
+    }
+
+    @Benchmark
+    public float intBitsToFloat_NaN() {
+        return Float.intBitsToFloat(intFloatNaN);
+    }
+
+}
+
diff --git a/test/micro/org/openjdk/bench/java/lang/ref/CleanerChurn.java b/test/micro/org/openjdk/bench/java/lang/ref/CleanerChurn.java
new file mode 100644
index 00000000000..eab4c0f59d0
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/ref/CleanerChurn.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang.ref;
+
+import java.lang.ref.Cleaner;
+import java.lang.ref.Cleaner.Cleanable;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 3, jvmArgs = {"-Xmx256m", "-Xms256m", "-XX:+AlwaysPreTouch"})
+public class CleanerChurn {
+
+    @Param({"128", "256", "512", "1024", "2048"})
+    int recipFreq;
+
+    @Benchmark
+    public Object test() {
+        boolean register = ThreadLocalRandom.current().nextInt(recipFreq) == 0;
+        return new Target(register);
+    }
+
+    static class Target {
+        private static final Cleaner CLEANER = Cleaner.create();
+        public Target(boolean register) {
+            if (register) {
+                CLEANER.register(this, () -> {});
+            }
+        }
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/ref/CleanerGC.java b/test/micro/org/openjdk/bench/java/lang/ref/CleanerGC.java
new file mode 100644
index 00000000000..8d43f25c6c6
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/ref/CleanerGC.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang.ref;
+
+import java.lang.ref.Cleaner;
+import java.lang.ref.Cleaner.Cleanable;
+import java.util.ArrayList;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@State(Scope.Thread)
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 3, jvmArgs = {"-Xmx1g", "-Xms1g", "-XX:+AlwaysPreTouch"})
+public class CleanerGC {
+
+    @Param({"16384", "65536", "262144", "1048576", "4194304"})
+    int count;
+
+    // Make sure all targets are reachable and available for GC in scalable manner.
+    // This exposes the potential GC problem in Cleaner lists.
+    ArrayList<Target> targets;
+
+    @Setup
+    public void setup() {
+        targets = new ArrayList<>();
+        for (int c = 0; c < count; c++) {
+            targets.add(new Target());
+        }
+    }
+
+    @Benchmark
+    public void test() {
+        System.gc();
+    }
+
+    static class Target {
+        private static final Cleaner CLEANER = Cleaner.create();
+        public Target() {
+            CLEANER.register(this, () -> {});
+        }
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java b/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java
index 5f64e114877..685f73e64ce 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java
@@ -47,6 +47,7 @@
         "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
         "--add-exports", "java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED",
         "--enable-preview",
+        "--add-exports", "java.base/jdk.internal.classfile.components=ALL-UNNAMED",
         "--add-exports", "java.base/jdk.internal.classfile.impl=ALL-UNNAMED"})
 @State(Scope.Benchmark)
 public class AbstractCorpusBenchmark {
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java b/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java
index b9c9082625c..f8f29036545 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java
@@ -31,12 +31,13 @@
 import java.util.List;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
-import java.lang.classfile.components.ClassPrinter;
+import jdk.internal.classfile.components.ClassPrinter;
 import org.openjdk.jmh.annotations.*;
 
 @BenchmarkMode(Mode.Throughput)
 @State(Scope.Benchmark)
 @Fork(value = 1, jvmArgs = {
+        "--add-exports", "java.base/jdk.internal.classfile.components=ALL-UNNAMED",
         "--enable-preview"})
 @Warmup(iterations = 3)
 @Measurement(iterations = 4)
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java b/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
index e4d553c268f..8af03a8b874 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
@@ -22,11 +22,8 @@
  */
 package org.openjdk.bench.jdk.classfile;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 
@@ -43,7 +40,7 @@
 import java.lang.classfile.CodeTransform;
 import java.lang.classfile.MethodModel;
 import java.lang.classfile.MethodTransform;
-import java.lang.classfile.components.ClassRemapper;
+import jdk.internal.classfile.components.ClassRemapper;
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
 import jdk.internal.org.objectweb.asm.Attribute;
 import jdk.internal.org.objectweb.asm.ClassReader;