diff --git a/closed/GensrcJ9JCL.gmk b/closed/GensrcJ9JCL.gmk
index 1f63911def5..60156268f7d 100644
--- a/closed/GensrcJ9JCL.gmk
+++ b/closed/GensrcJ9JCL.gmk
@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2020, 2023 All Rights Reserved
+# (c) Copyright IBM Corp. 2020, 2024 All Rights Reserved
 # ===========================================================================
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
@@ -39,6 +39,7 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \
 	SRC := $(TOPDIR), \
 	DEST := $(SUPPORT_OUTPUTDIR)/overlay, \
 	FILES := \
+		make/data/jdwp/jdwp.spec \
 		src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java \
 		src/java.base/share/classes/java/lang/ClassValue.java \
 		src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java \
@@ -56,6 +57,13 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \
 		src/java.base/share/classes/sun/security/provider/SecureRandom.java \
 		src/java.base/unix/classes/java/lang/ProcessEnvironment.java \
 		src/java.base/unix/classes/sun/security/provider/NativePRNG.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java \
+		src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java \
 	))
 
 IncludeIfUnsure := -includeIfUnsure -noWarnIncludeIf
diff --git a/closed/src/jdk.jdi/share/classes/com/sun/jdi/event/VMRestoreEvent.java b/closed/src/jdk.jdi/share/classes/com/sun/jdi/event/VMRestoreEvent.java
new file mode 100644
index 00000000000..f9da42c07d1
--- /dev/null
+++ b/closed/src/jdk.jdi/share/classes/com/sun/jdi/event/VMRestoreEvent.java
@@ -0,0 +1,50 @@
+/*[INCLUDE-IF CRIU_SUPPORT]*/
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * IBM designates this particular file as subject to the "Classpath" exception
+ * as provided by IBM 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, see <http://www.gnu.org/licenses/>.
+ *
+ * ===========================================================================
+ */
+package com.sun.jdi.event;
+
+import com.sun.jdi.ThreadReference;
+import com.sun.jdi.VirtualMachine;
+
+/**
+ * Notification of when the VM is restored from a checkpoint. Similar to
+ * VMStartEvent this occurs before application code has run, including any
+ * application hooks for the restore event.
+ * The event is generated even if not explicitly requested.
+ *
+ * @see VMStartEvent
+ * @see VMDeathEvent
+ * @see EventQueue
+ * @see VirtualMachine
+ */
+public interface VMRestoreEvent extends Event {
+
+    /**
+     * Returns the thread which is restoring the VM from a checkpoint.
+     *
+     * @return a {@link ThreadReference} representing the restore thread
+     * on the target VM.
+     */
+    public ThreadReference thread();
+}
diff --git a/make/data/jdwp/jdwp.spec b/make/data/jdwp/jdwp.spec
index 51fe13cd9ef..8b10550308e 100644
--- a/make/data/jdwp/jdwp.spec
+++ b/make/data/jdwp/jdwp.spec
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 JDWP "Java(tm) Debug Wire Protocol"
 (CommandSet VirtualMachine=1
     (Command Version=1
@@ -3090,6 +3096,17 @@ JDWP "Java(tm) Debug Wire Protocol"
                         (int requestID
                                 "Request that generated event")
                     )
+/*[IF CRIU_SUPPORT]*/
+                    (Alt VMRestore=JDWP.EventKind.VM_RESTORE
+                        "Notification of when the VM is restored from a checkpoint. Similar to"
+                        "VMStartEvent this occurs before application code has run, including any"
+                        "application hooks for the restore event."
+                        "The event is generated even if not explicitly requested."
+
+                        (int requestID "Request that generated event")
+                        (threadObject thread "The thread restoring the VM from a checkpoint.")
+                    )
+/*[ENDIF] CRIU_SUPPORT */
                 )
             )
         )
@@ -3219,6 +3236,9 @@ JDWP "Java(tm) Debug Wire Protocol"
     (Constant VM_INIT                =90  "obsolete - was used in jvmdi")
     (Constant VM_DEATH               =99  )
     (Constant VM_DISCONNECTED        =100 "Never sent across JDWP")
+/*[IF CRIU_SUPPORT]*/
+    (Constant VM_RESTORE             =101 "OpenJ9 VM Restored")
+/*[ENDIF] CRIU_SUPPORT */
 )
 
 (ConstantSet ThreadStatus
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
index cd416ccf24e..4f25e7cd2f3 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
@@ -31,6 +31,11 @@
  * this sample code.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
 
 package com.sun.tools.example.debug.tty;
 
@@ -118,6 +123,10 @@ private boolean handleEvent(Event event) {
             return threadDeathEvent(event);
         } else if (event instanceof VMStartEvent) {
             return vmStartEvent(event);
+/*[IF CRIU_SUPPORT]*/
+        } else if (event instanceof VMRestoreEvent restoreEvent) {
+            return vmRestoreEvent(restoreEvent);
+/*[ENDIF] CRIU_SUPPORT */
         } else {
             return handleExitEvent(event);
         }
@@ -179,6 +188,10 @@ private ThreadReference eventThread(Event event) {
             return ((ThreadDeathEvent)event).thread();
         } else if (event instanceof VMStartEvent) {
             return ((VMStartEvent)event).thread();
+/*[IF CRIU_SUPPORT]*/
+        } else if (event instanceof VMRestoreEvent restoreEvent) {
+            return restoreEvent.thread();
+/*[ENDIF] CRIU_SUPPORT */
         } else {
             return null;
         }
@@ -210,6 +223,13 @@ private boolean vmStartEvent(Event event)  {
         return stopOnVMStart;
     }
 
+/*[IF CRIU_SUPPORT]*/
+    private boolean vmRestoreEvent(VMRestoreEvent restoreEvent) {
+        notifier.vmRestoreEvent(restoreEvent);
+        return stopOnVMStart;
+    }
+/*[ENDIF] CRIU_SUPPORT */
+
     private boolean breakpointEvent(Event event)  {
         BreakpointEvent be = (BreakpointEvent)event;
         notifier.breakpointEvent(be);
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java
index 1a0ee622059..cb20ebe8b69 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 /*
  * This source code is provided to illustrate the usage of a given feature
  * or technique and has been deliberately simplified. Additional steps
@@ -38,6 +44,9 @@
 
 interface EventNotifier {
     void vmStartEvent(VMStartEvent e);
+/*[IF CRIU_SUPPORT]*/
+    void vmRestoreEvent(VMRestoreEvent e);
+/*[ENDIF] CRIU_SUPPORT */
     void vmDeathEvent(VMDeathEvent e);
     void vmDisconnectEvent(VMDisconnectEvent e);
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
index f6bd858d9be..f3455dfdfc0 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 /*
  * This source code is provided to illustrate the usage of a given feature
  * or technique and has been deliberately simplified. Additional steps
@@ -73,6 +79,14 @@ public void vmStartEvent(VMStartEvent se)  {
         MessageOutput.lnprint("VM Started:");
     }
 
+/*[IF CRIU_SUPPORT]*/
+    @Override
+    public void vmRestoreEvent(VMRestoreEvent re) {
+        Thread.yield(); // fetch output
+        MessageOutput.lnprint("VM Restored:");
+    }
+/*[ENDIF] CRIU_SUPPORT */
+
     @Override
     public void vmDeathEvent(VMDeathEvent e)  {
     }
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
index 5f773288e5e..685ab85ee49 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 /*
  * This source code is provided to illustrate the usage of a given feature
  * or technique and has been deliberately simplified. Additional steps
@@ -484,6 +490,9 @@ public Object[][] getContents() {
              "<arguments> are the arguments passed to the main() method of <class>\n" +
              "\n" +
              "For command help type ''help'' at {0} prompt"},
+/*[IF CRIU_SUPPORT]*/
+        {"VM Restored:", "VM restored from checkpoint:"},
+/*[ENDIF] CRIU_SUPPORT */
         // END OF MATERIAL TO LOCALIZE
         };
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
index af4a782e85a..a9a1a127d1b 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 /*
  * This source code is provided to illustrate the usage of a given feature
  * or technique and has been deliberately simplified. Additional steps
@@ -338,6 +344,9 @@ public Object[][] getContents() {
              "** \u30B3\u30DE\u30F3\u30C9\u30FB\u30EA\u30B9\u30C8 **\nconnectors                -- \u3053\u306EVM\u5185\u306E\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3068\u30C8\u30E9\u30F3\u30B9\u30DD\u30FC\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nrun [class [args]]        -- \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u5B9F\u884C\u3092\u958B\u59CB\u3057\u307E\u3059\n\nthreads [threadgroup]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthread <thread id>        -- \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\nsuspend [thread id(s)]    -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nresume [thread id(s)]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u518D\u958B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nwhere [<thread id> | all] -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30C0\u30F3\u30D7\u3057\u307E\u3059\nwherei [<thread id> | all]-- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092pc\u60C5\u5831\u3068\u3068\u3082\u306B\u30C0\u30F3\u30D7\u3057\u307E\u3059\nup [n frames]             -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0A\u306B\u79FB\u52D5\u3057\u307E\u3059\ndown [n frames]           -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0B\u306B\u79FB\u52D5\u3057\u307E\u3059\nkill <thread id> <expr>   -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u30B9\u30EC\u30C3\u30C9\u3092\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\ninterrupt <thread id>     -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n\nprint <expr>              -- \u5F0F\u306E\u5024\u3092\u51FA\u529B\u3057\u307E\u3059\ndump <expr>               -- \u3059\u3079\u3066\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\neval <expr>               -- \u5F0F\u3092\u8A55\u4FA1\u3057\u307E\u3059(print\u3068\u540C\u3058)\nset <lvalue> = <expr>     -- \u65B0\u3057\u3044\u5024\u3092\u30D5\u30A3\u30FC\u30EB\u30C9/\u5909\u6570/\u914D\u5217\u8981\u7D20\u306B\u4EE3\u5165\u3057\u307E\u3059\nlocals                    -- \u73FE\u5728\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u5185\u306E\u3059\u3079\u3066\u306E\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u3092\u51FA\u529B\u3057\u307E\u3059\n\nclasses                   -- \u73FE\u5728\u65E2\u77E5\u306E\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nclass <class id>          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\nmethods <class id>        -- \u30AF\u30E9\u30B9\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nfields <class id>         -- \u30AF\u30E9\u30B9\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nthreadgroups              -- \u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthreadgroup <name>        -- \u73FE\u5728\u306E\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                          -- \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u306E\u73FE\u5728\u306E\u30EA\u30B9\u30C8\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\n                          -- \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n                          -- \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n                          -- \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n                          -- <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u30E1\u30BD\u30C3\u30C9\u5185\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear <class id>:<line>   -- \u884C\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear                     -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u3068\u304D\u306B\u30D6\u30EC\u30FC\u30AF\u3057\u307E\u3059\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u306E'catch'\u3092\u53D6\u308A\u6D88\u3057\u307E\u3059\nwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u3092\u30A6\u30A9\u30C3\u30C1\u3057\u307E\u3059\nunwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1\u3092\u4E2D\u6B62\u3057\u307E\u3059\ntrace [go] methods [thread]\n                          -- \u30E1\u30BD\u30C3\u30C9\u306E\u5165\u308A\u53E3\u3068\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\u3002\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\ntrace [go] method exit | exits [thread]\n                          -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\nuntrace [methods]         -- \u30E1\u30BD\u30C3\u30C9\u306E\u958B\u59CB\u307E\u305F\u306F\u7D42\u4E86\u306E\u30C8\u30EC\u30FC\u30B9\u3092\u505C\u6B62\u3057\u307E\u3059\nstep                      -- \u73FE\u5728\u306E\u884C\u3092\u5B9F\u884C\u3057\u307E\u3059\nstep up                   -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u5143\u306B\u623B\u308B\u307E\u3067\u5B9F\u884C\u3057\u307E\u3059\nstepi                     -- \u73FE\u5728\u306E\u547D\u4EE4\u3092\u5B9F\u884C\u3057\u307E\u3059\nnext                      -- 1\u884C\u3092\u30B9\u30C6\u30C3\u30D7\u5B9F\u884C\u3057\u307E\u3059(\u547C\u51FA\u3057\u3092\u30B9\u30C6\u30C3\u30D7\u30AA\u30FC\u30D0\u30FC)\ncont                      -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u304B\u3089\u5B9F\u884C\u3092\u7D9A\u884C\u3057\u307E\u3059\n\nlist [line number|method] -- \u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u3092\u51FA\u529B\u3057\u307E\u3059\nuse (or sourcepath) [source file path]\n                          -- \u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u30B9\u30C6\u30C3\u30D7\u3084\u30E1\u30BD\u30C3\u30C9\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u5831\u544A\u3057\u307E\u305B\u3093\nclasspath                 -- \u30BF\u30FC\u30B2\u30C3\u30C8VM\u304B\u3089\u30AF\u30E9\u30B9\u30D1\u30B9\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\nmonitor <command>         -- \u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u505C\u6B62\u3059\u308B\u305F\u3073\u306B\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059\nmonitor                   -- \u30E2\u30CB\u30BF\u30FC\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nunmonitor <monitor#>      -- \u30E2\u30CB\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\nread <filename>           -- \u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u3063\u3066\u5B9F\u884C\u3057\u307E\u3059\n\nlock <expr>               -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nthreadlocks [thread id]   -- \u30B9\u30EC\u30C3\u30C9\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\npop                       -- \u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u307E\u3067\u306E\u3059\u3079\u3066\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30DD\u30C3\u30D7\u3057\u307E\u3059\nreenter                   -- pop\u3068\u540C\u3058\u3067\u3059\u304C\u3001\u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u304C\u518D\u5165\u529B\u3055\u308C\u307E\u3059\nredefine <class id> <class file name>\n                          -- \u30AF\u30E9\u30B9\u306E\u30B3\u30FC\u30C9\u3092\u518D\u5B9A\u7FA9\u3057\u307E\u3059\n\ndisablegc <expr>          -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6291\u5236\u3057\u307E\u3059\nenablegc <expr>           -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u8A31\u53EF\u3057\u307E\u3059\n\n!!                        -- \u6700\u5F8C\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u7E70\u308A\u8FD4\u3057\u307E\u3059\n<n> <command>             -- \u30B3\u30DE\u30F3\u30C9\u3092n\u56DE\u7E70\u308A\u8FD4\u3057\u307E\u3059\n# <command>               -- \u7834\u68C4\u3057\u307E\u3059(\u64CD\u4F5C\u306A\u3057)\nhelp (\u307E\u305F\u306F?)               -- \u30B3\u30DE\u30F3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ndbgtrace [flag]           -- dbgtrace\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u540C\u3058\u3067\u3059\nversion                   -- \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nexit (\u307E\u305F\u306Fquit)            -- \u30C7\u30D0\u30C3\u30AC\u3092\u7D42\u4E86\u3057\u307E\u3059\n\n<class id>: \u30D1\u30C3\u30B1\u30FC\u30B8\u4FEE\u98FE\u5B50\u3092\u542B\u3080\u5B8C\u5168\u30AF\u30E9\u30B9\u540D\n<class pattern>: \u5148\u982D\u307E\u305F\u306F\u672B\u5C3E\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9('*')\u3092\u542B\u3080\u30AF\u30E9\u30B9\u540D\n<thread id>: 'threads'\u30B3\u30DE\u30F3\u30C9\u3067\u5831\u544A\u3055\u308C\u308B\u30B9\u30EC\u30C3\u30C9\u756A\u53F7\n<expr>: Java(TM)\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u306E\u5F0F\u3002\n\u307B\u3068\u3093\u3069\u306E\u4E00\u822C\u7684\u306A\u69CB\u6587\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\n\u8D77\u52D5\u30B3\u30DE\u30F3\u30C9\u306F\u3001\"jdb.ini\"\u307E\u305F\u306F\".jdbrc\"\u306B\u914D\u7F6E\u3067\u304D\u307E\u3059\n(user.home\u307E\u305F\u306Fuser.dir\u5185)"},
         {"zz usage text",
              "\u4F7F\u7528\u65B9\u6CD5: {0} <options> <class> <arguments>\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n    -? -h --help -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n    -sourcepath <directories separated by \"{1}\">\n                      \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n    -attach <address>\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306B\u63A5\u7D9A\u3059\u308B\n    -listen <address>\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306E\u63A5\u7D9A\u3092\u5F85\u6A5F\u3059\u308B\n    -listenany\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u4F7F\u7528\u53EF\u80FD\u306A\u4EFB\u610F\u306E\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306E\u63A5\u7D9A\u3092\u5F85\u6A5F\u3059\u308B\n    -launch\n                      ''run''\u30B3\u30DE\u30F3\u30C9\u3092\u5F85\u6A5F\u305B\u305A\u306BVM\u3092\u5373\u6642\u306B\u8D77\u52D5\u3059\u308B\n    -listconnectors   \u3053\u306EVM\u3067\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3092\u30EA\u30B9\u30C8\u3059\u308B\n    -connect <connector-name>:<name1>=<value1>,...\n                      \u6307\u5B9A\u3055\u308C\u305F\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u30EA\u30B9\u30C8\u3055\u308C\u305F\u5F15\u6570\u5024\u3067\u30BF\u30FC\u30B2\u30C3\u30C8VM\u306B\u63A5\u7D9A\u3059\u308B\n    -dbgtrace [flags] {0}\u306E\u30C7\u30D0\u30C3\u30B0\u306E\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B\n    -tclient          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092HotSpot(TM) Client Compiler\u3067\u5B9F\u884C\u3059\u308B\n    -tserver          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092HotSpot(TM) Server Compiler\u3067\u5B9F\u884C\u3059\u308B\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u8EE2\u9001\u3055\u308C\u307E\u3059:\n    -v -verbose[:class|gc|jni]\n                      \u8A73\u7D30\u30E2\u30FC\u30C9\u3092\u30AA\u30F3\u306B\u3059\u308B\n    -D<name>=<value>  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n    -classpath <directories separated by \"{1}\">\n                      \u30AF\u30E9\u30B9\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u30EA\u30B9\u30C8\u3059\u308B\n    -X<option>        \u975E\u6A19\u6E96\u306E\u30BF\u30FC\u30B2\u30C3\u30C8VM\u30AA\u30D7\u30B7\u30E7\u30F3\n\n<class>\u306F\u30C7\u30D0\u30C3\u30B0\u3092\u958B\u59CB\u3059\u308B\u30AF\u30E9\u30B9\u306E\u540D\u524D\u3067\u3059\n<arguments>\u306F<class>\u306Emain()\u30E1\u30BD\u30C3\u30C9\u306B\u6E21\u3055\u308C\u308B\u5F15\u6570\u3067\u3059\n\n\u30B3\u30DE\u30F3\u30C9\u306E\u30D8\u30EB\u30D7\u306B\u3064\u3044\u3066\u306F{0}\u30D7\u30ED\u30F3\u30D7\u30C8\u3067''help''\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
+/*[IF CRIU_SUPPORT]*/
+        {"VM Restored:", "\u0056\u004D\u0020\u304C\u30C1\u30A7\u30C3\u30AF\u30DD\u30A4\u30F3\u30C8\u304B\u3089\u5FA9\u5143\u3055\u308C\u307E\u3057\u305F\u003A"},
+/*[ENDIF] CRIU_SUPPORT */
         // END OF MATERIAL TO LOCALIZE
         };
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
index 2215941048a..68279f4cbb6 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 /*
  * This source code is provided to illustrate the usage of a given feature
  * or technique and has been deliberately simplified. Additional steps
@@ -338,6 +344,9 @@ public Object[][] getContents() {
              "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u8BBE\u7F6E\u65AD\u70B9\n                          -- \u5982\u679C\u672A\u63D0\u4F9B\u4EFB\u4F55\u9009\u9879\uFF0C\u5219\u5C06\u6253\u5370\u5F53\u524D\u65AD\u70B9\u5217\u8868\n                          -- \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n                          -- \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n                          -- \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n                          -- \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n                          -- \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n                          -- <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\n\u4E0B\u4E00\u6B65                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\ndbgtrace [flag]           -- \u4E0E dbgtrace \u547D\u4EE4\u884C\u9009\u9879\u76F8\u540C\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
         {"zz usage text",
              "\u7528\u6CD5\uFF1A{0} <\u9009\u9879> <\u7C7B> <\u53C2\u6570>\n\n\u5176\u4E2D\uFF0C\u9009\u9879\u5305\u62EC\uFF1A\n    -? -h --help -help \u8F93\u51FA\u6B64\u6D88\u606F\u5E76\u9000\u51FA\n    -sourcepath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u8981\u5728\u5176\u4E2D\u67E5\u627E\u6E90\u6587\u4EF6\u7684\u76EE\u5F55\n    -attach <\u5730\u5740>\n                      \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u9644\u52A0\u5230\u6307\u5B9A\u5730\u5740\u5904\u6B63\u5728\u8FD0\u884C\u7684 VM\n    -listen <\u5730\u5740>\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u6307\u5B9A\u5730\u5740\u5904\u8FDE\u63A5\n    -listenany\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u4EFB\u4F55\u53EF\u7528\u5730\u5740\u5904\u8FDE\u63A5\n    -launch\n                      \u7ACB\u5373\u542F\u52A8 VM \u800C\u4E0D\u662F\u7B49\u5F85 ''run'' \u547D\u4EE4\n    -listconnectors   \u5217\u51FA\u6B64 VM \u4E2D\u7684\u53EF\u7528\u8FDE\u63A5\u5668\n    -connect <\u8FDE\u63A5\u5668\u540D\u79F0>:<\u540D\u79F0 1>=<\u503C 1>,...\n                      \u4F7F\u7528\u6240\u5217\u53C2\u6570\u503C\u901A\u8FC7\u6307\u5B9A\u7684\u8FDE\u63A5\u5668\u8FDE\u63A5\u5230\u76EE\u6807 VM\n    -dbgtrace [flags] \u8F93\u51FA\u8C03\u8BD5 {0} \u7684\u4FE1\u606F\n    -tclient          \u5728 HotSpot(TM) \u5BA2\u6237\u673A\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n    -tserver          \u5728 HotSpot(TM) \u670D\u52A1\u5668\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n\n\u8F6C\u53D1\u5230\u88AB\u8C03\u8BD5\u8FDB\u7A0B\u7684\u9009\u9879\uFF1A\n    -v -verbose[:class|gc|jni]\n                      \u542F\u7528\u8BE6\u7EC6\u6A21\u5F0F\n    -D<\u540D\u79F0>=<\u503C>  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -classpath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u5217\u51FA\u8981\u5728\u5176\u4E2D\u67E5\u627E\u7C7B\u7684\u76EE\u5F55\n    -X<\u9009\u9879>        \u975E\u6807\u51C6\u76EE\u6807 VM \u9009\u9879\n\n<\u7C7B> \u662F\u8981\u5F00\u59CB\u8C03\u8BD5\u7684\u7C7B\u7684\u540D\u79F0\n<\u53C2\u6570> \u662F\u4F20\u9012\u5230 <\u7C7B> \u7684 main() \u65B9\u6CD5\u7684\u53C2\u6570\n\n\u8981\u83B7\u5F97\u547D\u4EE4\u7684\u5E2E\u52A9\uFF0C\u8BF7\u5728 {0} \u63D0\u793A\u4E0B\u952E\u5165 ''help''"},
+/*[IF CRIU_SUPPORT]*/
+        {"VM Restored:", "\u865A\u62DF\u673A\u4ECE\u68C0\u67E5\u70B9\u6062\u590D\uFF1A"},
+/*[ENDIF] CRIU_SUPPORT */
         // END OF MATERIAL TO LOCALIZE
         };
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java
index 846d7343823..43557031663 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 package com.sun.tools.jdi;
 
 import java.util.ArrayList;
@@ -63,6 +69,9 @@
 import com.sun.jdi.event.ThreadStartEvent;
 import com.sun.jdi.event.VMDeathEvent;
 import com.sun.jdi.event.VMDisconnectEvent;
+/*[IF CRIU_SUPPORT]*/
+import com.sun.jdi.event.VMRestoreEvent;
+/*[ENDIF] CRIU_SUPPORT */
 import com.sun.jdi.event.VMStartEvent;
 import com.sun.jdi.event.WatchpointEvent;
 import com.sun.jdi.request.EventRequest;
@@ -494,6 +503,20 @@ String eventName() {
         }
     }
 
+/*[IF CRIU_SUPPORT]*/
+    class VMRestoreEventImpl extends ThreadedEventImpl implements VMRestoreEvent {
+
+        VMRestoreEventImpl(JDWP.Event.Composite.Events.VMRestore evt) {
+            super(evt, evt.requestID, evt.thread);
+        }
+
+        @Override
+        String eventName() {
+            return "VMRestoreEvent";
+        }
+    }
+/*[ENDIF] CRIU_SUPPORT */
+
     class VMDeathEventImpl extends EventImpl implements VMDeathEvent {
 
         VMDeathEventImpl(JDWP.Event.Composite.Events.VMDeath evt) {
@@ -805,6 +828,12 @@ EventImpl createEvent(JDWP.Event.Composite.Events evt) {
                 return new VMDeathEventImpl(
                       (JDWP.Event.Composite.Events.VMDeath)comm);
 
+/*[IF CRIU_SUPPORT]*/
+            case JDWP.EventKind.VM_RESTORE:
+                return new VMRestoreEventImpl(
+                      (JDWP.Event.Composite.Events.VMRestore)comm);
+/*[ENDIF] CRIU_SUPPORT */
+
             default:
                 // Ignore unknown event types
                 System.err.println("Ignoring event cmd " +
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
index 757a1c10e58..10a7bf77315 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #include <ctype.h>
 
 #include "util.h"
@@ -38,6 +44,7 @@
 #include "bag.h"
 #include "invoker.h"
 #include "sys.h"
+#include "j9cfg.h"
 
 /* How the options get to OnLoad: */
 #define XRUN "-Xrunjdwp"
@@ -74,6 +81,9 @@ static jboolean initOnUncaught = JNI_FALSE; /* init when uncaught exc thrown */
 
 static char *launchOnInit = NULL;           /* launch this app during init */
 static jboolean suspendOnInit = JNI_TRUE;   /* suspend all app threads after init */
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+static jboolean suspendOnRestore = JNI_TRUE; /* suspend all app threads after VM restored */
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 static jboolean dopause = JNI_FALSE;        /* pause for debugger attach */
 static jboolean docoredump = JNI_FALSE;     /* core dump on exit */
 static char *logfile = NULL;                /* Name of logfile (if logging) */
@@ -101,6 +111,9 @@ static void JNICALL cbEarlyVMInit(jvmtiEnv*, JNIEnv *, jthread);
 static void JNICALL cbEarlyVMDeath(jvmtiEnv*, JNIEnv *);
 static void JNICALL cbEarlyException(jvmtiEnv*, JNIEnv *,
             jthread, jmethodID, jlocation, jobject, jmethodID, jlocation);
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+static void JNICALL cbEarlyVMRestore(jvmtiEnv *, ...);
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 
 static void initialize(JNIEnv *env, jthread thread, EventIndex triggering_ei, EventInfo *opt_info);
 static jboolean parseOptions(char *str);
@@ -377,6 +390,16 @@ DEF_Agent_OnLoad(JavaVM *vm, char *options, void *reserved)
                         jvmtiErrorText(error), error));
         return JNI_ERR;
     }
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    /* Enable extension events and set early callbacks for them. */
+    error = JVMTI_FUNC_PTR(gdata->jvmti, SetExtensionEventCallback)
+                (gdata->jvmti, eventIndex2jvmti(EI_VM_RESTORE), &cbEarlyVMRestore);
+    if (JVMTI_ERROR_NONE != error) {
+        ERROR_MESSAGE(("JDWP unable to set JVMTI extension event callbacks: %s(%d)",
+                        jvmtiErrorText(error), error));
+        return JNI_ERR;
+    }
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 
     LOG_MISC(("OnLoad: DONE"));
     return JNI_OK;
@@ -443,6 +466,30 @@ cbEarlyVMInit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread)
     LOG_MISC(("END cbEarlyVMInit"));
 }
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+static void JNICALL
+cbEarlyVMRestore(jvmtiEnv *jvmti_env, ...)
+{
+    JNIEnv *env = NULL;
+    jthread thread = NULL;
+    va_list args;
+
+    va_start(args, jvmti_env);
+    env = va_arg(args, JNIEnv *);
+    thread = va_arg(args, jthread);
+    va_end(args);
+
+    LOG_CB(("cbEarlyVMRestore"));
+    if (gdata->vmDead) {
+        EXIT_ERROR(AGENT_ERROR_INTERNAL, "VM dead at restore time");
+    }
+    if (suspendOnRestore) {
+        initialize(env, thread, EI_VM_RESTORE, NULL);
+    }
+    LOG_MISC(("END cbEarlyVMRestore"));
+}
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
 static void
 disposeEnvironment(jvmtiEnv *jvmti_env)
 {
@@ -711,6 +758,15 @@ initialize(JNIEnv *env, jthread thread, EventIndex triggering_ei, EventInfo *opt
         EXIT_ERROR(error, "unable to clear JVMTI callbacks");
     }
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    /* Remove initial extension event callbacks and disable the events. */
+    error = JVMTI_FUNC_PTR(gdata->jvmti, SetExtensionEventCallback)
+                (gdata->jvmti, eventIndex2jvmti(EI_VM_RESTORE), NULL);
+    if (JVMTI_ERROR_NONE != error) {
+        EXIT_ERROR(error, "unable to clear extension event callbacks");
+    }
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
     commonRef_initialize();
     util_initialize(env);
     threadControl_initialize();
@@ -754,7 +810,21 @@ initialize(JNIEnv *env, jthread thread, EventIndex triggering_ei, EventInfo *opt
                                   : JDWP_SUSPEND_POLICY(NONE);
     if (triggering_ei == EI_VM_INIT) {
         LOG_MISC(("triggering_ei == EI_VM_INIT"));
-        eventHelper_reportVMInit(env, currentSessionID, thread, suspendPolicy);
+        eventHelper_reportVMInit(env, currentSessionID, thread, suspendPolicy, JNI_FALSE);
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    } else if (EI_VM_RESTORE == triggering_ei) {
+        LOG_MISC(("triggering_ei == EI_VM_RESTORE"));
+        if (suspendOnRestore) {
+            /* Wait for a connection since if threads are suspended,
+             * we need an attached debugger to resume the VM.
+             */
+            transport_waitForConnectionOnRestore();
+            suspendPolicy = JDWP_SUSPEND_POLICY(ALL);
+        } else {
+            suspendPolicy = JDWP_SUSPEND_POLICY(NONE);
+        }
+        eventHelper_reportVMInit(env, currentSessionID, thread, suspendPolicy, JNI_TRUE);
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
     } else {
         /*
          * TO DO: Kludgy way of getting the triggering event to the
@@ -837,6 +907,14 @@ debugInit_suspendOnInit(void)
     return suspendOnInit;
 }
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+jboolean
+debugInit_suspendOnRestore(void)
+{
+    return suspendOnRestore;
+}
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
 /*
  * code below is shamelessly swiped from hprof.
  */
@@ -1221,6 +1299,12 @@ parseOptions(char *options)
             if ( !get_boolean(&str, &suspendOnInit) ) {
                 goto syntax_error;
             }
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+        } else if (0 == strcmp(buf, "suspendOnRestore")) {
+            if (!get_boolean(&str, &suspendOnRestore)) {
+                goto syntax_error;
+            }
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
         } else if ( strcmp(buf, "server")==0 ) {
             if ( !get_boolean(&str, &isServer) ) {
                 goto syntax_error;
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h
index 794e349d895..3bb71c904df 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h
@@ -23,9 +23,17 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #ifndef JDWP_DEBUGINIT_H
 #define JDWP_DEBUGINIT_H
 
+#include "j9cfg.h"
+
 void debugInit_waitInitComplete(void);
 jboolean debugInit_isInitComplete(void);
 
@@ -34,6 +42,9 @@ jboolean debugInit_isInitComplete(void);
  */
 char *debugInit_launchOnInit(void);
 jboolean debugInit_suspendOnInit(void);
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+jboolean debugInit_suspendOnRestore(void);
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 
 void debugInit_reset(JNIEnv *env);
 void debugInit_exit(jvmtiError, const char *);
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
index 52414babaec..8e2f5c177e0 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
@@ -22,6 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 /*
  * eventFilter
  *
@@ -40,6 +47,7 @@
 #include "threadControl.h"
 #include "SDE.h"
 #include "jvmti.h"
+#include "j9cfg.h"
 
 typedef struct ClassFilter {
     jclass clazz;
@@ -1240,6 +1248,9 @@ enableEvents(HandlerNode *node)
         case EI_VM_DEATH:
         case EI_CLASS_PREPARE:
         case EI_GC_FINISH:
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+        case EI_VM_RESTORE:
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
             return error;
 
         case EI_FIELD_ACCESS:
@@ -1299,6 +1310,9 @@ disableEvents(HandlerNode *node)
         case EI_VM_DEATH:
         case EI_CLASS_PREPARE:
         case EI_GC_FINISH:
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+        case EI_VM_RESTORE:
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
             return error;
 
         case EI_FIELD_ACCESS:
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
index c79d27246bc..f52da67544e 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
@@ -22,6 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 /*
  * eventHandler
  *
@@ -68,6 +75,10 @@
 #include "commonRef.h"
 #include "debugLoop.h"
 #include "signature.h"
+#include "j9cfg.h"
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+#include "transport.h"
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 
 static HandlerID requestIdCounter;
 static jbyte currentSessionID;
@@ -1187,6 +1198,47 @@ cbVMInit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread)
     LOG_MISC(("END cbVMInit"));
 }
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+/* Event callback for JVMTI_EVENT_VM_RESTORE */
+static void JNICALL
+cbVMRestore(jvmtiEnv *jvmti_env, ...)
+{
+    EventInfo info;
+    JNIEnv *env = NULL;
+    jthread thread = NULL;
+    va_list args;
+    jbyte suspendPolicy = JDWP_SUSPEND_POLICY(NONE);
+
+    va_start(args, jvmti_env);
+    env = va_arg(args, JNIEnv *);
+    thread = va_arg(args, jthread);
+    va_end(args);
+
+    LOG_CB(("cbVMRestore"));
+
+    BEGIN_CALLBACK() {
+        (void)memset(&info, 0, sizeof(info));
+        info.ei = EI_VM_RESTORE;
+        info.thread = thread;
+        event_callback(env, &info);
+    } END_CALLBACK();
+
+    if (debugInit_suspendOnRestore()) {
+        /* Wait for a connection since if threads are suspended,
+         * we need an attached debugger to resume the VM.
+         */
+        transport_waitForConnectionOnRestore();
+        suspendPolicy = JDWP_SUSPEND_POLICY(ALL);
+    }
+    /* The VM restore extension event needs to call the helper instead
+     * of using the normal event handler code similar to the VM init event.
+     */
+    eventHelper_reportVMInit(env, currentSessionID, thread, suspendPolicy, JNI_TRUE);
+
+    LOG_MISC(("END cbVMRestore"));
+}
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
 /* Event callback for JVMTI_EVENT_VM_DEATH */
 static void JNICALL
 cbVMDeath(jvmtiEnv *jvmti_env, JNIEnv *env)
@@ -1204,6 +1256,15 @@ cbVMDeath(jvmtiEnv *jvmti_env, JNIEnv *env)
         EXIT_ERROR(error,"Can't clear event callbacks on vm death");
     }
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    /* Clear extension event callbacks. */
+    error = JVMTI_FUNC_PTR(gdata->jvmti, SetExtensionEventCallback)
+                (gdata->jvmti, eventIndex2jvmti(EI_VM_RESTORE), NULL);
+    if (JVMTI_ERROR_NONE != error) {
+        EXIT_ERROR(error, "Can't clear event extension callbacks on vm death");
+    }
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
     /* Now that no new callbacks will be made, we need to wait for the ones
      *   that are still active to complete.
      *   The BEGIN_CALLBACK/END_CALLBACK macros implement the VM_DEATH
@@ -1497,6 +1558,14 @@ eventHandler_initialize(jbyte sessionID)
     if (error != JVMTI_ERROR_NONE) {
         EXIT_ERROR(error,"Can't set event callbacks");
     }
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    /* Enable event and set callback for VMRestore extension event. */
+    error = JVMTI_FUNC_PTR(gdata->jvmti, SetExtensionEventCallback)
+                (gdata->jvmti, eventIndex2jvmti(EI_VM_RESTORE), &cbVMRestore);
+    if (JVMTI_ERROR_NONE != error) {
+        EXIT_ERROR(error, "Can't set event extension callbacks");
+    }
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 
     /* Notify other modules that the event callbacks are in place */
     threadControl_onHook();
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
index 24d489b4a5d..cbc2e7f5af4 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
@@ -23,12 +23,19 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #include "util.h"
 #include "outStream.h"
 #include "eventHandler.h"
 #include "threadControl.h"
 #include "invoker.h"
 #include "signature.h"
+#include "j9cfg.h"
 
 
 #define COMMAND_LOOP_THREAD_NAME "JDWP Event Helper Thread"
@@ -40,6 +47,9 @@
 #define COMMAND_REPORT_INVOKE_DONE              2
 #define COMMAND_REPORT_VM_INIT                  3
 #define COMMAND_SUSPEND_THREAD                  4
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+#define COMMAND_REPORT_VM_RESTORE               5
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 
 /*
  * Event helper thread command singleKinds
@@ -571,7 +581,7 @@ handleReportInvokeDoneCommand(JNIEnv* env, ReportInvokeDoneCommand *command)
 }
 
 static void
-handleReportVMInitCommand(JNIEnv* env, ReportVMInitCommand *command)
+handleReportVMInitCommand(JNIEnv* env, ReportVMInitCommand *command, jbyte jdwpEvent)
 {
     PacketOutputStream out;
 
@@ -586,7 +596,7 @@ handleReportVMInitCommand(JNIEnv* env, ReportVMInitCommand *command)
                           JDWP_COMMAND(Event, Composite));
     (void)outStream_writeByte(&out, command->suspendPolicy);
     (void)outStream_writeInt(&out, 1);   /* Always one component */
-    (void)outStream_writeByte(&out, JDWP_EVENT(VM_INIT));
+    (void)outStream_writeByte(&out, jdwpEvent);
     (void)outStream_writeInt(&out, 0);    /* Not in response to an event req. */
 
     (void)outStream_writeObjectRef(env, &out, command->thread);
@@ -594,6 +604,11 @@ handleReportVMInitCommand(JNIEnv* env, ReportVMInitCommand *command)
     outStream_sendCommand(&out);
     outStream_destroy(&out);
     /* Why aren't we tossing this: tossGlobalRef(env, &(command->thread)); */
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    if (JDWP_EVENT(VM_RESTORE) == jdwpEvent) {
+        tossGlobalRef(env, &command->thread);
+    }
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 }
 
 static void
@@ -619,11 +634,16 @@ handleCommand(JNIEnv *env, HelperCommand *command)
             handleReportInvokeDoneCommand(env, &command->u.reportInvokeDone);
             break;
         case COMMAND_REPORT_VM_INIT:
-            handleReportVMInitCommand(env, &command->u.reportVMInit);
+            handleReportVMInitCommand(env, &command->u.reportVMInit, JDWP_EVENT(VM_INIT));
             break;
         case COMMAND_SUSPEND_THREAD:
             handleSuspendThreadCommand(env, &command->u.suspendThread);
             break;
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+        case COMMAND_REPORT_VM_RESTORE:
+            handleReportVMInitCommand(env, &command->u.reportVMInit, JDWP_EVENT(VM_RESTORE));
+            break;
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
         default:
             EXIT_ERROR(AGENT_ERROR_INVALID_EVENT_TYPE,"Event Helper Command");
             break;
@@ -1144,14 +1164,21 @@ eventHelper_reportInvokeDone(jbyte sessionID, jthread thread)
  * because the JVMTI event does not contain a thread.
  */
 void
-eventHelper_reportVMInit(JNIEnv *env, jbyte sessionID, jthread thread, jbyte suspendPolicy)
+eventHelper_reportVMInit(JNIEnv *env, jbyte sessionID, jthread thread, jbyte suspendPolicy, jboolean isVMRestore)
 {
     HelperCommand *command = jvmtiAllocate(sizeof(*command));
     if (command == NULL) {
         EXIT_ERROR(AGENT_ERROR_OUT_OF_MEMORY,"HelperCommmand");
     }
     (void)memset(command, 0, sizeof(*command));
-    command->commandKind = COMMAND_REPORT_VM_INIT;
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    if (isVMRestore) {
+        command->commandKind = COMMAND_REPORT_VM_RESTORE;
+    } else
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+    {
+        command->commandKind = COMMAND_REPORT_VM_INIT;
+    }
     command->sessionID = sessionID;
     saveGlobalRef(env, thread, &(command->u.reportVMInit.thread));
     command->u.reportVMInit.suspendPolicy = suspendPolicy;
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h b/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h
index 8387cb0f3da..8c0dd6826f3 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.h
@@ -23,11 +23,18 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #ifndef JDWP_EVENTHELPER_H
 #define JDWP_EVENTHELPER_H
 
 #include "bag.h"
 #include "invoker.h"
+#include "j9cfg.h"
 
 void eventHelper_initialize(jbyte sessionID);
 void eventHelper_reset(jbyte sessionID);
@@ -45,7 +52,7 @@ void eventHelper_recordFrameEvent(jint id, jbyte suspendPolicy, EventIndex ei,
 
 jbyte eventHelper_reportEvents(jbyte sessionID, struct bag *eventBag);
 void eventHelper_reportInvokeDone(jbyte sessionID, jthread thread);
-void eventHelper_reportVMInit(JNIEnv *env, jbyte sessionID, jthread thread, jbyte suspendPolicy);
+void eventHelper_reportVMInit(JNIEnv *env, jbyte sessionID, jthread thread, jbyte suspendPolicy, jboolean isVMRestore);
 void eventHelper_suspendThread(jbyte sessionID, jthread thread);
 
 void eventHelper_holdEvents(void);
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
index 3807caedb87..a1a3d04b441 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #include "util.h"
 #include "eventHandler.h"
 #include "threadControl.h"
@@ -31,6 +37,10 @@
 #include "stepControl.h"
 #include "invoker.h"
 #include "bag.h"
+#include "j9cfg.h"
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+#include "ibmjvmti.h"
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 
 #define HANDLING_EVENT(node) ((node)->current_ei != 0)
 
@@ -1697,6 +1707,34 @@ threadControl_getInvokeRequest(jthread thread)
     return request;
 }
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+static jvmtiExtensionFunction
+find_ext_function(jvmtiEnv *jvmti, const char *funcName)
+{
+    jint extCount = 0;
+    jvmtiExtensionFunctionInfo *extList = NULL;
+    jvmtiExtensionFunction retFunc = NULL;
+
+    jvmtiError err = JVMTI_FUNC_PTR(jvmti, GetExtensionFunctions)
+                            (jvmti, &extCount, &extList);
+    if (JVMTI_ERROR_NONE == err) {
+        jint i = 0;
+        for (i = 0; i < extCount; i++) {
+            if (0 == strcmp(extList[i].id, funcName)) {
+                retFunc = extList[i].func;
+                break;
+            }
+        }
+    } else {
+        ERROR_MESSAGE(("Error in JVMTI GetExtensionFunctions: %s(%d)\n", jvmtiErrorText(err), err));
+    }
+    return retFunc;
+}
+
+static jvmtiExtensionFunction addDebugThreadToCheckpointState_func = NULL;
+static jvmtiExtensionFunction removeDebugThreadFromCheckpointState_func = NULL;
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
 jvmtiError
 threadControl_addDebugThread(jthread thread)
 {
@@ -1716,6 +1754,12 @@ threadControl_addDebugThread(jthread thread)
         } else {
             debugThreadCount++;
             error = JVMTI_ERROR_NONE;
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+            if (NULL == addDebugThreadToCheckpointState_func) {
+                addDebugThreadToCheckpointState_func = find_ext_function(gdata->jvmti, OPENJ9_FUNCTION_ADD_DEBUG_THREAD);
+            }
+            error = (*addDebugThreadToCheckpointState_func)(gdata->jvmti, thread);
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
         }
     }
     debugMonitorExit(threadLock);
@@ -1743,6 +1787,12 @@ threadControl_removeDebugThread(jthread thread)
             }
             debugThreadCount--;
             error = JVMTI_ERROR_NONE;
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+            if (NULL == removeDebugThreadFromCheckpointState_func) {
+                removeDebugThreadFromCheckpointState_func = find_ext_function(gdata->jvmti, OPENJ9_FUNCTION_REMOVE_DEBUG_THREAD);
+            }
+            error = (*removeDebugThreadFromCheckpointState_func)(gdata->jvmti, thread);
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
             break;
         }
     }
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/transport.c b/src/jdk.jdwp.agent/share/native/libjdwp/transport.c
index 3f3c0942303..f7e48d7d487 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/transport.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/transport.c
@@ -23,11 +23,18 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #include "util.h"
 #include "utf_util.h"
 #include "transport.h"
 #include "debugLoop.h"
 #include "sys.h"
+#include "j9cfg.h"
 
 static jdwpTransportEnv *transport = NULL;
 static unsigned transportVersion = JDWPTRANSPORT_VERSION_1_0;
@@ -345,6 +352,22 @@ transport_waitForConnection(void)
     }
 }
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+void
+transport_waitForConnectionOnRestore(void)
+{
+    /* Assuming the caller already checked the flag suspendOnRestore.
+     * We need to wait for a connection since the VM won't continue
+     * without a remote debugger telling it to.
+     */
+    debugMonitorEnter(listenerLock);
+    while (NULL == transport) {
+        debugMonitorWait(listenerLock);
+    }
+    debugMonitorExit(listenerLock);
+}
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
 static void JNICALL
 acceptThread(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg)
 {
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/transport.h b/src/jdk.jdwp.agent/share/native/libjdwp/transport.h
index ea40588932b..bdeb6913037 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/transport.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/transport.h
@@ -23,10 +23,17 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #ifndef JDWP_TRANSPORT_H
 #define JDWP_TRANSPORT_H
 
 #include "jdwpTransport.h"
+#include "j9cfg.h"
 
 void transport_initialize(void);
 void transport_reset(void);
@@ -37,6 +44,9 @@ jint transport_receivePacket(jdwpPacket *);
 jint transport_sendPacket(jdwpPacket *);
 jboolean transport_is_open(void);
 void transport_waitForConnection(void);
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+void transport_waitForConnectionOnRestore(void);
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 void transport_close(void);
 
 #endif
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.c b/src/jdk.jdwp.agent/share/native/libjdwp/util.c
index 2403c5273ba..c37ed79cdf7 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/util.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.c
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #include <ctype.h>
 
 #include "util.h"
@@ -34,6 +40,10 @@
 #include "inStream.h"
 #include "invoker.h"
 #include "signature.h"
+#include "j9cfg.h"
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+#include "ibmjvmti.h"
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 
 
 /* Global data area */
@@ -1912,9 +1922,47 @@ map2jvmtiError(jdwpError error)
     return AGENT_ERROR_INTERNAL;
 }
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+static jvmtiExtensionEventInfo *
+find_ext_event(jvmtiEnv *jvmti, const char *eventName)
+{
+    jint extCount = 0;
+    jvmtiExtensionEventInfo *extList = NULL;
+    jvmtiExtensionEventInfo *retEventInfo = NULL;
+
+    jvmtiError err = JVMTI_FUNC_PTR(jvmti, GetExtensionEvents)
+                            (jvmti, &extCount, &extList);
+    if (JVMTI_ERROR_NONE == err) {
+        jint i = 0;
+        for (i = 0; i < extCount; i++) {
+            if (0 == strcmp(extList[i].id, eventName)) {
+                retEventInfo = &extList[i];
+                break;
+            }
+        }
+    } else {
+        ERROR_MESSAGE(("Error in JVMTI GetExtensionEvents: %s(%d)\n", jvmtiErrorText(err), err));
+    }
+    return retEventInfo;
+}
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
 static jvmtiEvent index2jvmti[EI_max-EI_min+1];
 static jdwpEvent  index2jdwp [EI_max-EI_min+1];
 
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+static void
+extensionEventIndexInit(void)
+{
+    /* VM restore event */
+    jvmtiExtensionEventInfo *extEvent = find_ext_event(gdata->jvmti, OPENJ9_EVENT_VM_RESTORE);
+    if (NULL != extEvent) {
+        index2jvmti[EI_VM_RESTORE - EI_min] = extEvent->extension_event_index;
+    }
+    index2jdwp[EI_VM_RESTORE - EI_min] = JDWP_EVENT(VM_RESTORE);
+}
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
 void
 eventIndexInit(void)
 {
@@ -1962,6 +2010,10 @@ eventIndexInit(void)
     index2jdwp[EI_MONITOR_WAITED      -EI_min] = JDWP_EVENT(MONITOR_WAITED);
     index2jdwp[EI_VM_INIT             -EI_min] = JDWP_EVENT(VM_INIT);
     index2jdwp[EI_VM_DEATH            -EI_min] = JDWP_EVENT(VM_DEATH);
+
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    extensionEventIndexInit();
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 }
 
 jdwpEvent
@@ -2028,6 +2080,10 @@ eventIndex2EventName(EventIndex ei)
             return "EI_VM_INIT";
         case EI_VM_DEATH:
             return "EI_VM_DEATH";
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+        case EI_VM_RESTORE:
+            return "EI_VM_RESTORE";
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
         default:
             JDI_ASSERT(JNI_FALSE);
             return "Bad EI";
@@ -2096,6 +2152,14 @@ jdwp2EventIndex(jdwpEvent eventType)
 EventIndex
 jvmti2EventIndex(jvmtiEvent kind)
 {
+    /* JVMTI extension events */
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+    if (index2jvmti[EI_VM_RESTORE - EI_min] == kind) {
+        return EI_VM_RESTORE;
+    }
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
+
+    /* normal JVMTI events*/
     switch ( kind ) {
         case JVMTI_EVENT_SINGLE_STEP:
             return EI_SINGLE_STEP;
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.h b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
index f62b5c409f0..4735c62a0ba 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/util.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 #ifndef JDWP_UTIL_H
 #define JDWP_UTIL_H
 
@@ -58,6 +64,7 @@
 #include "util_md.h"
 #include "error_messages.h"
 #include "debugInit.h"
+#include "j9cfg.h"
 
 /* Definition of a CommonRef tracked by the backend for the frontend */
 typedef struct RefNode {
@@ -167,7 +174,13 @@ typedef enum {
         EI_MONITOR_WAITED       = 18,
         EI_VM_INIT              = 19,
         EI_VM_DEATH             = 20,
+#if defined(J9VM_OPT_CRIU_SUPPORT)
+        EI_VM_RESTORE           = 21,
+
+        EI_max                  = 21
+#else /* defined(J9VM_OPT_CRIU_SUPPORT) */
         EI_max                  = 20
+#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 } EventIndex;
 
 /* Agent errors that might be in a jvmtiError for JDWP or internal.