diff --git a/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties b/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
index cc794cf4f5d..354c3bbdabc 100644
--- a/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
+++ b/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/FileChooserDemo
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
index ac5178cfa30..a95dd376609 100644
--- a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Font2DTest/build.properties b/src/demo/share/nbproject/jfc/Font2DTest/build.properties
index 6007cd75194..4b84026f90a 100644
--- a/src/demo/share/nbproject/jfc/Font2DTest/build.properties
+++ b/src/demo/share/nbproject/jfc/Font2DTest/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Font2DTest
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
index b40575d3667..4a0baefef11 100644
--- a/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Metalworks/build.properties b/src/demo/share/nbproject/jfc/Metalworks/build.properties
index 7a085159923..67842ab17a6 100644
--- a/src/demo/share/nbproject/jfc/Metalworks/build.properties
+++ b/src/demo/share/nbproject/jfc/Metalworks/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Metalworks
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
index b31e670af65..61600a42881 100644
--- a/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Notepad/build.properties b/src/demo/share/nbproject/jfc/Notepad/build.properties
index 7d2c25a9088..d057d8e0f4b 100644
--- a/src/demo/share/nbproject/jfc/Notepad/build.properties
+++ b/src/demo/share/nbproject/jfc/Notepad/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Notepad
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
index 7a0b1bec5fb..ee89bd8ef27 100644
--- a/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/SampleTree/build.properties b/src/demo/share/nbproject/jfc/SampleTree/build.properties
index 5d90b3bea5a..c6ea2c9eabe 100644
--- a/src/demo/share/nbproject/jfc/SampleTree/build.properties
+++ b/src/demo/share/nbproject/jfc/SampleTree/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/SampleTree
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
index 9a7810f4d71..65550cfd3bb 100644
--- a/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/TableExample/build.properties b/src/demo/share/nbproject/jfc/TableExample/build.properties
index b23535ce172..35ed324e056 100644
--- a/src/demo/share/nbproject/jfc/TableExample/build.properties
+++ b/src/demo/share/nbproject/jfc/TableExample/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/TableExample
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
index 00822acc570..56251eb2a82 100644
--- a/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/TransparentRuler/build.properties b/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
index b1b2ef89b82..333c6515adb 100644
--- a/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
+++ b/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/TransparentRuler
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
index 84a0e9b3c5e..663b96fc147 100644
--- a/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
index 76ea4cad783..2fcb35a1ae1 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
@@ -39,7 +39,7 @@ enum platform_dependent_constants {
   _initial_stubs_code_size      = 10000,
   _continuation_stubs_code_size =  2000,
   _compiler_stubs_code_size     = 30000 ZGC_ONLY(+10000),
-  _final_stubs_code_size        = 20000 ZGC_ONLY(+60000)
+  _final_stubs_code_size        = 20000 ZGC_ONLY(+100000)
 };
 
 class aarch64 {
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 140d0281e2f..8746efebc21 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -471,9 +471,7 @@ void before_exit(JavaThread* thread, bool halt) {
 
   // Stop the WatcherThread. We do this before disenrolling various
   // PeriodicTasks to reduce the likelihood of races.
-  if (PeriodicTask::num_tasks() > 0) {
-    WatcherThread::stop();
-  }
+  WatcherThread::stop();
 
   // shut down the StatSampler task
   StatSampler::disengage();
diff --git a/src/hotspot/share/runtime/nonJavaThread.cpp b/src/hotspot/share/runtime/nonJavaThread.cpp
index 3fbfa080e1f..f537afcaa06 100644
--- a/src/hotspot/share/runtime/nonJavaThread.cpp
+++ b/src/hotspot/share/runtime/nonJavaThread.cpp
@@ -156,7 +156,7 @@ void NamedThread::print_on(outputStream* st) const {
 // timer interrupts exists on the platform.
 
 WatcherThread* WatcherThread::_watcher_thread   = nullptr;
-bool WatcherThread::_startable = false;
+bool WatcherThread::_run_all_tasks = false;
 volatile bool  WatcherThread::_should_terminate = false;
 
 WatcherThread::WatcherThread() : NonJavaThread() {
@@ -185,6 +185,11 @@ int WatcherThread::sleep() const {
     return 0;  // we did not sleep.
   }
 
+  if (!_run_all_tasks) {
+    ml.wait(100);
+    return 0;
+  }
+
   // remaining will be zero if there are no tasks,
   // causing the WatcherThread to sleep until a task is
   // enrolled
@@ -280,7 +285,10 @@ void WatcherThread::run() {
       break;
     }
 
-    PeriodicTask::real_time_tick(time_waited);
+    // Don't process enrolled tasks until VM is fully initialized.
+    if (_run_all_tasks) {
+      PeriodicTask::real_time_tick(time_waited);
+    }
   }
 
   // Signal that it is terminated
@@ -293,18 +301,16 @@ void WatcherThread::run() {
 }
 
 void WatcherThread::start() {
-  assert(PeriodicTask_lock->owned_by_self(), "PeriodicTask_lock required");
-
-  if (watcher_thread() == nullptr && _startable) {
-    _should_terminate = false;
-    // Create the single instance of WatcherThread
-    new WatcherThread();
-  }
+  MonitorLocker ml(PeriodicTask_lock);
+  _should_terminate = false;
+  // Create the single instance of WatcherThread
+  new WatcherThread();
 }
 
-void WatcherThread::make_startable() {
-  assert(PeriodicTask_lock->owned_by_self(), "PeriodicTask_lock required");
-  _startable = true;
+void WatcherThread::run_all_tasks() {
+  MonitorLocker ml(PeriodicTask_lock);
+  _run_all_tasks = true;
+  ml.notify();
 }
 
 void WatcherThread::stop() {
diff --git a/src/hotspot/share/runtime/nonJavaThread.hpp b/src/hotspot/share/runtime/nonJavaThread.hpp
index 7807af6e228..6d9095924d9 100644
--- a/src/hotspot/share/runtime/nonJavaThread.hpp
+++ b/src/hotspot/share/runtime/nonJavaThread.hpp
@@ -110,7 +110,7 @@ class WatcherThread: public NonJavaThread {
  private:
   static WatcherThread* _watcher_thread;
 
-  static bool _startable;
+  static bool _run_all_tasks;
   // volatile due to at least one lock-free read
   volatile static bool _should_terminate;
  public:
@@ -137,9 +137,9 @@ class WatcherThread: public NonJavaThread {
   // Create and start the single instance of WatcherThread, or stop it on shutdown
   static void start();
   static void stop();
-  // Only allow start once the VM is sufficiently initialized
-  // Otherwise the first task to enroll will trigger the start
-  static void make_startable();
+  // Allow executing registered tasks once the VM is sufficiently
+  // initialized. Meanwhile only error reporting will be checked.
+  static void run_all_tasks();
  private:
   int sleep() const;
 };
diff --git a/src/hotspot/share/runtime/task.cpp b/src/hotspot/share/runtime/task.cpp
index d38c1d145d0..9eccd368d25 100644
--- a/src/hotspot/share/runtime/task.cpp
+++ b/src/hotspot/share/runtime/task.cpp
@@ -29,6 +29,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/nonJavaThread.hpp"
 #include "runtime/task.hpp"
+#include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 
 int PeriodicTask::_num_tasks = 0;
@@ -95,10 +96,9 @@ void PeriodicTask::enroll() {
   }
 
   WatcherThread* thread = WatcherThread::watcher_thread();
+  assert(thread != nullptr || !Threads::is_vm_complete(), "vm created but no WatcherThread");
   if (thread != nullptr) {
     thread->unpark();
-  } else {
-    WatcherThread::start();
   }
 }
 
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 4f6fcf76db1..302c3672ce0 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -553,6 +553,10 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     return status;
   }
 
+  // Create WatcherThread as soon as we can since we need it in case
+  // of hangs during error reporting.
+  WatcherThread::start();
+
   // Add main_thread to threads list to finish barrier setup with
   // on_thread_attach.  Should be before starting to build Java objects in
   // init_globals2, which invokes barriers.
@@ -792,19 +796,11 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     CLEAR_PENDING_EXCEPTION;
   }
 
-  {
-    MutexLocker ml(PeriodicTask_lock);
-    // Make sure the WatcherThread can be started by WatcherThread::start()
-    // or by dynamic enrollment.
-    WatcherThread::make_startable();
-    // Start up the WatcherThread if there are any periodic tasks
-    // NOTE:  All PeriodicTasks should be registered by now. If they
-    //   aren't, late joiners might appear to start slowly (we might
-    //   take a while to process their first tick).
-    if (PeriodicTask::num_tasks() > 0) {
-      WatcherThread::start();
-    }
-  }
+  // Let WatcherThread run all registered periodic tasks now.
+  // NOTE:  All PeriodicTasks should be registered by now. If they
+  //   aren't, late joiners might appear to start slowly (we might
+  //   take a while to process their first tick).
+  WatcherThread::run_all_tasks();
 
   create_vm_timer.end();
 #ifdef ASSERT
diff --git a/src/java.base/share/classes/java/lang/ScopedValue.java b/src/java.base/share/classes/java/lang/ScopedValue.java
index 9aab6669a7c..7fea72469e2 100644
--- a/src/java.base/share/classes/java/lang/ScopedValue.java
+++ b/src/java.base/share/classes/java/lang/ScopedValue.java
@@ -394,19 +394,20 @@ public <T> T get(ScopedValue<T> key) {
          * to its value in the current thread.
          * When the operation completes (normally or with an exception), each scoped value
          * in the mapping will revert to being unbound, or revert to its previous value
-         * when previously bound, in the current thread.
+         * when previously bound, in the current thread. If {@code op} completes with an
+         * exception then it propagated by this method.
          *
-         * <p> Scoped values are intended to be used in a <em>structured manner</em>.
-         * If {@code op} creates a {@link StructuredTaskScope} but does not {@linkplain
-         * StructuredTaskScope#close() close} it, then exiting {@code op} causes the
-         * underlying construct of each {@code StructuredTaskScope} created in the
-         * dynamic scope to be closed. This may require blocking until all child threads
-         * have completed their sub-tasks. The closing is done in the reverse order that
-         * they were created. Once closed, {@link StructureViolationException} is thrown.
+         * <p> Scoped values are intended to be used in a <em>structured manner</em>. If code
+         * invoked directly or indirectly by the operation creates a {@link StructuredTaskScope}
+         * but does not {@linkplain StructuredTaskScope#close() close} it, then it is detected
+         * as a <em>structure violation</em> when the operation completes (normally or with an
+         * exception). In that case, the underlying construct of the {@code StructuredTaskScope}
+         * is closed and {@link StructureViolationException} is thrown.
          *
          * @param op the operation to run
          * @param <R> the type of the result of the operation
          * @return the result
+         * @throws StructureViolationException if a structure violation is detected
          * @throws Exception if {@code op} completes with an exception
          * @see ScopedValue#callWhere(ScopedValue, Object, Callable)
          */
@@ -423,19 +424,20 @@ public <R> R call(Callable<? extends R> op) throws Exception {
          * to its value in the current thread.
          * When the operation completes (normally or with an exception), each scoped value
          * in the mapping will revert to being unbound, or revert to its previous value
-         * when previously bound, in the current thread.
+         * when previously bound, in the current thread. If {@code op} completes with an
+         * exception then it propagated by this method.
          *
-         * <p> Scoped values are intended to be used in a <em>structured manner</em>.
-         * If {@code op} creates a {@link StructuredTaskScope} but does not {@linkplain
-         * StructuredTaskScope#close() close} it, then exiting {@code op} causes the
-         * underlying construct of each {@code StructuredTaskScope} created in the
-         * dynamic scope to be closed. This may require blocking until all child threads
-         * have completed their sub-tasks. The closing is done in the reverse order that
-         * they were created. Once closed, {@link StructureViolationException} is thrown.
+         * <p> Scoped values are intended to be used in a <em>structured manner</em>. If code
+         * invoked directly or indirectly by the operation creates a {@link StructuredTaskScope}
+         * but does not {@linkplain StructuredTaskScope#close() close} it, then it is detected
+         * as a <em>structure violation</em> when the operation completes (normally or with an
+         * exception). In that case, the underlying construct of the {@code StructuredTaskScope}
+         * is closed and {@link StructureViolationException} is thrown.
          *
          * @param op the operation to run
          * @param <R> the type of the result of the operation
          * @return the result
+         * @throws StructureViolationException if a structure violation is detected
          * @see ScopedValue#getWhere(ScopedValue, Object, Supplier)
          */
         public <R> R get(Supplier<? extends R> op) {
@@ -486,17 +488,18 @@ private <R> R runWith(Snapshot newSnapshot, Callable<R> op) {
          * in the current thread.
          * When the operation completes (normally or with an exception), each scoped value
          * in the mapping will revert to being unbound, or revert to its previous value
-         * when previously bound, in the current thread.
+         * when previously bound, in the current thread. If {@code op} completes with an
+         * exception then it propagated by this method.
          *
-         * <p> Scoped values are intended to be used in a <em>structured manner</em>.
-         * If {@code op} creates a {@link StructuredTaskScope} but does not {@linkplain
-         * StructuredTaskScope#close() close} it, then exiting {@code op} causes the
-         * underlying construct of each {@code StructuredTaskScope} created in the
-         * dynamic scope to be closed. This may require blocking until all child threads
-         * have completed their sub-tasks. The closing is done in the reverse order that
-         * they were created. Once closed, {@link StructureViolationException} is thrown.
+         * <p> Scoped values are intended to be used in a <em>structured manner</em>. If code
+         * invoked directly or indirectly by the operation creates a {@link StructuredTaskScope}
+         * but does not {@linkplain StructuredTaskScope#close() close} it, then it is detected
+         * as a <em>structure violation</em> when the operation completes (normally or with an
+         * exception). In that case, the underlying construct of the {@code StructuredTaskScope}
+         * is closed and {@link StructureViolationException} is thrown.
          *
          * @param op the operation to run
+         * @throws StructureViolationException if a structure violation is detected
          * @see ScopedValue#runWhere(ScopedValue, Object, Runnable)
          */
         public void run(Runnable op) {
@@ -553,15 +556,15 @@ public static <T> Carrier where(ScopedValue<T> key, T value) {
      * Calls a value-returning operation with a {@code ScopedValue} bound to a value
      * in the current thread. When the operation completes (normally or with an
      * exception), the {@code ScopedValue} will revert to being unbound, or revert to
-     * its previous value when previously bound, in the current thread.
+     * its previous value when previously bound, in the current thread. If {@code op}
+     * completes with an exception then it propagated by this method.
      *
-     * <p> Scoped values are intended to be used in a <em>structured manner</em>.
-     * If {@code op} creates a {@link StructuredTaskScope} but does not {@linkplain
-     * StructuredTaskScope#close() close} it, then exiting {@code op} causes the
-     * underlying construct of each {@code StructuredTaskScope} created in the
-     * dynamic scope to be closed. This may require blocking until all child threads
-     * have completed their sub-tasks. The closing is done in the reverse order that
-     * they were created. Once closed, {@link StructureViolationException} is thrown.
+     * <p> Scoped values are intended to be used in a <em>structured manner</em>. If code
+     * invoked directly or indirectly by the operation creates a {@link StructuredTaskScope}
+     * but does not {@linkplain StructuredTaskScope#close() close} it, then it is detected
+     * as a <em>structure violation</em> when the operation completes (normally or with an
+     * exception). In that case, the underlying construct of the {@code StructuredTaskScope}
+     * is closed and {@link StructureViolationException} is thrown.
      *
      * @implNote
      * This method is implemented to be equivalent to:
@@ -576,6 +579,7 @@ public static <T> Carrier where(ScopedValue<T> key, T value) {
      * @param <R> the result type
      * @param op the operation to call
      * @return the result
+     * @throws StructureViolationException if a structure violation is detected
      * @throws Exception if the operation completes with an exception
      */
     public static <T, R> R callWhere(ScopedValue<T> key,
@@ -588,15 +592,15 @@ public static <T, R> R callWhere(ScopedValue<T> key,
      * Invokes a supplier of results with a {@code ScopedValue} bound to a value
      * in the current thread. When the operation completes (normally or with an
      * exception), the {@code ScopedValue} will revert to being unbound, or revert to
-     * its previous value when previously bound, in the current thread.
+     * its previous value when previously bound, in the current thread. If {@code op}
+     * completes with an exception then it propagated by this method.
      *
-     * <p> Scoped values are intended to be used in a <em>structured manner</em>.
-     * If {@code op} creates a {@link StructuredTaskScope} but does not {@linkplain
-     * StructuredTaskScope#close() close} it, then exiting {@code op} causes the
-     * underlying construct of each {@code StructuredTaskScope} created in the
-     * dynamic scope to be closed. This may require blocking until all child threads
-     * have completed their sub-tasks. The closing is done in the reverse order that
-     * they were created. Once closed, {@link StructureViolationException} is thrown.
+     * <p> Scoped values are intended to be used in a <em>structured manner</em>. If code
+     * invoked directly or indirectly by the operation creates a {@link StructuredTaskScope}
+     * but does not {@linkplain StructuredTaskScope#close() close} it, then it is detected
+     * as a <em>structure violation</em> when the operation completes (normally or with an
+     * exception). In that case, the underlying construct of the {@code StructuredTaskScope}
+     * is closed and {@link StructureViolationException} is thrown.
      *
      * @implNote
      * This method is implemented to be equivalent to:
@@ -611,6 +615,7 @@ public static <T, R> R callWhere(ScopedValue<T> key,
      * @param <R> the result type
      * @param op the operation to call
      * @return the result
+     * @throws StructureViolationException if a structure violation is detected
      */
     public static <T, R> R getWhere(ScopedValue<T> key,
                                     T value,
@@ -622,15 +627,15 @@ public static <T, R> R getWhere(ScopedValue<T> key,
      * Run an operation with a {@code ScopedValue} bound to a value in the current
      * thread. When the operation completes (normally or with an exception), the
      * {@code ScopedValue} will revert to being unbound, or revert to its previous value
-     * when previously bound, in the current thread.
+     * when previously bound, in the current thread. If {@code op} completes with an
+     * exception then it propagated by this method.
      *
-     * <p> Scoped values are intended to be used in a <em>structured manner</em>.
-     * If {@code op} creates a {@link StructuredTaskScope} but does not {@linkplain
-     * StructuredTaskScope#close() close} it, then exiting {@code op} causes the
-     * underlying construct of each {@code StructuredTaskScope} created in the
-     * dynamic scope to be closed. This may require blocking until all child threads
-     * have completed their sub-tasks. The closing is done in the reverse order that
-     * they were created. Once closed, {@link StructureViolationException} is thrown.
+     * <p> Scoped values are intended to be used in a <em>structured manner</em>. If code
+     * invoked directly or indirectly by the operation creates a {@link StructuredTaskScope}
+     * but does not {@linkplain StructuredTaskScope#close() close} it, then it is detected
+     * as a <em>structure violation</em> when the operation completes (normally or with an
+     * exception). In that case, the underlying construct of the {@code StructuredTaskScope}
+     * is closed and {@link StructureViolationException} is thrown.
      *
      * @implNote
      * This method is implemented to be equivalent to:
@@ -643,6 +648,7 @@ public static <T, R> R getWhere(ScopedValue<T> key,
      * @param value the value, can be {@code null}
      * @param <T> the type of the value
      * @param op the operation to call
+     * @throws StructureViolationException if a structure violation is detected
      */
     public static <T> void runWhere(ScopedValue<T> key, T value, Runnable op) {
         where(key, value).run(op);
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 c074cc8f896..2c2332018f0 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -1252,7 +1252,7 @@ static MemorySegment ofAddress(long address) {
      * {@code srcOffset} through {@code srcOffset + bytes - 1} in the source segment are copied into the destination
      * segment at offset {@code dstOffset} through {@code dstOffset + bytes - 1}.
      * <p>
-     * If the source segment overlaps with this segment, then the copying is performed as if the bytes at
+     * If the source segment overlaps with the destination segment, then the copying is performed as if the bytes at
      * offset {@code srcOffset} through {@code srcOffset + bytes - 1} in the source segment were first copied into a
      * temporary segment with size {@code bytes}, and then the contents of the temporary segment were copied into
      * the destination segment at offset {@code dstOffset} through {@code dstOffset + bytes - 1}.
@@ -1300,7 +1300,7 @@ static void copy(MemorySegment srcSegment, long srcOffset,
      * If the byte order of the two element layouts differ, the bytes corresponding to each element to be copied
      * are swapped accordingly during the copy operation.
      * <p>
-     * If the source segment overlaps with this segment, then the copying is performed as if the bytes at
+     * If the source segment overlaps with the destination segment, then the copying is performed as if the bytes at
      * offset {@code srcOffset} through {@code srcOffset + (elementCount * S) - 1} in the source segment were first copied into a
      * temporary segment with size {@code bytes}, and then the contents of the temporary segment were copied into
      * the destination segment at offset {@code dstOffset} through {@code dstOffset + (elementCount * S) - 1}.
diff --git a/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java
index 6e3fa4a561d..e7149c4dfe1 100644
--- a/src/java.base/share/classes/java/util/Calendar.java
+++ b/src/java.base/share/classes/java/util/Calendar.java
@@ -2701,25 +2701,25 @@ public String getCalendarType() {
      * @return {@code true} if this object is equal to {@code obj};
      * {@code false} otherwise.
      */
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        try {
-            Calendar that = (Calendar)obj;
-            return compareTo(getMillisOf(that)) == 0 &&
-                lenient == that.lenient &&
-                firstDayOfWeek == that.firstDayOfWeek &&
-                minimalDaysInFirstWeek == that.minimalDaysInFirstWeek &&
-                (zone instanceof ZoneInfo ?
-                    zone.equals(that.zone) :
-                    zone.equals(that.getTimeZone()));
-        } catch (Exception e) {
-            // Note: GregorianCalendar.computeTime throws
-            // IllegalArgumentException if the ERA value is invalid
-            // even it's in lenient mode.
+        if (obj instanceof Calendar that) {
+            try {
+                return compareTo(getMillisOf(that)) == 0 &&
+                    lenient == that.lenient &&
+                    firstDayOfWeek == that.firstDayOfWeek &&
+                    minimalDaysInFirstWeek == that.minimalDaysInFirstWeek &&
+                    (zone instanceof ZoneInfo ?
+                        zone.equals(that.zone) :
+                        zone.equals(that.getTimeZone()));
+            } catch (Exception e) {
+                // Note: GregorianCalendar.computeTime throws
+                // IllegalArgumentException if the ERA value is invalid
+                // even it's in lenient mode.
+            }
         }
         return false;
     }
diff --git a/test/jdk/sun/java2d/marlin/ScaleTest.java b/test/jdk/sun/java2d/marlin/ScaleTest.java
index bfd56422ba4..c9778a6477a 100644
--- a/test/jdk/sun/java2d/marlin/ScaleTest.java
+++ b/test/jdk/sun/java2d/marlin/ScaleTest.java
@@ -21,13 +21,17 @@
  * questions.
  */
 
+/* @test
+ * @summary Circle is rendered in C shape
+ * @bug 6829659 8311666
+ */
+
 import java.awt.*;
 import java.awt.geom.Ellipse2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import javax.imageio.ImageIO;
 
-
 public class ScaleTest {
   public static void main(String[] args) throws Exception {
     BufferedImage image = new BufferedImage(200, 200, BufferedImage.TYPE_INT_RGB);
diff --git a/test/jdk/sun/java2d/marlin/StrokeShapeTest.java b/test/jdk/sun/java2d/marlin/StrokeShapeTest.java
index 41413bff3e4..bc23f29e15d 100644
--- a/test/jdk/sun/java2d/marlin/StrokeShapeTest.java
+++ b/test/jdk/sun/java2d/marlin/StrokeShapeTest.java
@@ -20,6 +20,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/* @test
+ * @summary StrokeShapeTest: createStrokedShape() behaves differently
+ * @bug 6829678 8311666
+ */
+
 import java.awt.*;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.GeneralPath;
diff --git a/test/jdk/sun/java2d/marlin/ThinLineTest.java b/test/jdk/sun/java2d/marlin/ThinLineTest.java
index a1a033c0bd4..7450f4e421d 100644
--- a/test/jdk/sun/java2d/marlin/ThinLineTest.java
+++ b/test/jdk/sun/java2d/marlin/ThinLineTest.java
@@ -20,6 +20,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/* @test
+ * @summary ThinLineTest: A line < 1 pixel disappears.
+ * @bug 6829673 8311666
+ */
+
 import java.awt.*;
 import java.awt.geom.Ellipse2D;
 import java.awt.image.BufferedImage;