diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index e46033f2..c9010865 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2890,7 +2890,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "ahash",
  "async-trait",
@@ -2939,7 +2939,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2947,7 +2947,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "tracing",
  "uhlc",
@@ -2958,12 +2958,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "json5",
  "num_cpus",
@@ -2984,7 +2984,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -2995,7 +2995,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "aes",
  "hmac",
@@ -3008,7 +3008,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3025,7 +3025,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3039,7 +3039,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3056,7 +3056,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3079,7 +3079,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3104,7 +3104,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3121,7 +3121,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3148,7 +3148,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3167,7 +3167,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "nix",
@@ -3185,7 +3185,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3205,7 +3205,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3216,7 +3216,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "git-version",
  "libloading",
@@ -3232,7 +3232,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "const_format",
  "rand",
@@ -3246,7 +3246,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "anyhow",
 ]
@@ -3254,7 +3254,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3267,7 +3267,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "event-listener",
  "futures",
@@ -3280,7 +3280,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "futures",
  "tokio",
@@ -3293,7 +3293,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8762bffc2f2d4d8af9959f1cc109adce819fb1b"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a84dee3f85000c11fab81cc0028bbf2f907dc2"
 dependencies = [
  "async-trait",
  "const_format",