diff --git a/Cargo.lock b/Cargo.lock
index 30a7271..42650cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2832,7 +2832,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",
@@ -2878,7 +2878,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",
 ]
@@ -2886,7 +2886,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",
@@ -2897,12 +2897,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",
@@ -2924,7 +2924,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",
@@ -2935,7 +2935,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",
@@ -2948,7 +2948,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",
@@ -2965,7 +2965,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",
  "keyed-set",
@@ -2979,7 +2979,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",
@@ -2996,7 +2996,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",
@@ -3020,7 +3020,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",
@@ -3046,7 +3046,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",
@@ -3063,7 +3063,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",
@@ -3092,7 +3092,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",
@@ -3111,7 +3111,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",
@@ -3129,7 +3129,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",
@@ -3149,7 +3149,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",
@@ -3191,7 +3191,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",
@@ -3207,7 +3207,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",
@@ -3221,7 +3221,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",
 ]
@@ -3229,7 +3229,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",
@@ -3242,7 +3242,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",
@@ -3255,7 +3255,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",
@@ -3268,7 +3268,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",
@@ -3301,7 +3301,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",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "zenoh_backend_traits"
 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",