diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index ef32574d..f271a59a 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2868,7 +2868,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "ahash",
  "async-trait",
@@ -2914,7 +2914,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2922,7 +2922,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "tracing",
  "uhlc",
@@ -2933,12 +2933,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "json5",
  "num_cpus",
@@ -2959,7 +2959,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -2970,7 +2970,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "aes",
  "hmac",
@@ -2983,7 +2983,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3000,7 +3000,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3014,7 +3014,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3031,7 +3031,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3055,7 +3055,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3081,7 +3081,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3098,7 +3098,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3127,7 +3127,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3146,7 +3146,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "nix",
@@ -3164,7 +3164,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3184,7 +3184,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3195,7 +3195,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "git-version",
  "libloading",
@@ -3211,7 +3211,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "const_format",
  "rand",
@@ -3225,7 +3225,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "anyhow",
 ]
@@ -3233,7 +3233,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3246,7 +3246,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "event-listener",
  "futures",
@@ -3259,7 +3259,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "futures",
  "tokio",
@@ -3272,7 +3272,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3305,7 +3305,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "const_format",