diff --git a/Cargo.lock b/Cargo.lock
index c736dd5..a1d26ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3635,7 +3635,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-global-executor",
  "async-std",
@@ -3699,7 +3699,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3707,7 +3707,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "log 0.4.20",
  "serde",
@@ -3719,12 +3719,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "flume",
  "json5",
@@ -3743,7 +3743,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -3753,7 +3753,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "aes",
  "hmac",
@@ -3766,7 +3766,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "bincode",
@@ -3786,7 +3786,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3800,7 +3800,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3819,7 +3819,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3838,7 +3838,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-rustls",
  "async-std",
@@ -3863,7 +3863,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3879,7 +3879,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-rustls",
  "async-std",
@@ -3904,7 +3904,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3923,7 +3923,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3941,7 +3941,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3961,7 +3961,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4005,7 +4005,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "const_format",
  "libloading",
@@ -4021,7 +4021,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "const_format",
  "rand",
@@ -4035,7 +4035,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "anyhow",
 ]
@@ -4043,7 +4043,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "event-listener 4.0.0",
@@ -4057,7 +4057,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-executor",
  "async-global-executor",
@@ -4088,7 +4088,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4537dc26553397a4865953e46cacd6ed2ba5cfb6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#61838d57b88ba2d06f8e16720d6020a80502a905"
 dependencies = [
  "async-std",
  "async-trait",