diff --git a/Cargo.lock b/Cargo.lock
index 817ccfd..6485e1b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3934,7 +3934,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3983,7 +3983,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3991,7 +3991,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4002,12 +4002,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "flume",
  "json5",
@@ -4029,7 +4029,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4040,7 +4040,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4053,7 +4053,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -4067,7 +4067,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4084,7 +4084,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "flume",
@@ -4107,7 +4107,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4132,7 +4132,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4149,7 +4149,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4176,7 +4176,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4195,7 +4195,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "nix",
@@ -4213,7 +4213,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4233,7 +4233,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4244,7 +4244,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "git-version",
  "libloading",
@@ -4279,7 +4279,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4293,7 +4293,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "anyhow",
 ]
@@ -4301,7 +4301,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4314,7 +4314,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4327,7 +4327,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "futures",
  "tokio",
@@ -4340,7 +4340,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4373,7 +4373,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#55d539569d5ff53c5493220212d61edb3ff01d69"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#658cdd9bc419c03e6757c4d34da530b951b980e4"
 dependencies = [
  "async-trait",
  "const_format",