diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 153624d6..e00a74d4 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#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 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#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 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#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 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#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "json5",
  "num_cpus",
@@ -2960,7 +2960,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -2971,7 +2971,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "aes",
  "hmac",
@@ -2984,7 +2984,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3001,7 +3001,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3015,7 +3015,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3032,7 +3032,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3056,7 +3056,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3082,7 +3082,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3099,7 +3099,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3128,7 +3128,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3147,7 +3147,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "nix",
@@ -3165,7 +3165,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3185,7 +3185,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3196,7 +3196,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "git-version",
  "libloading",
@@ -3212,7 +3212,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "const_format",
  "rand",
@@ -3226,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "anyhow",
 ]
@@ -3234,7 +3234,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3247,7 +3247,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "event-listener",
  "futures",
@@ -3260,7 +3260,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "futures",
  "tokio",
@@ -3273,7 +3273,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3306,7 +3306,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b3ccf82e0f840e8f3ae59a8bd85c3c5a10468108"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
 dependencies = [
  "async-trait",
  "const_format",