diff --git a/Cargo.lock b/Cargo.lock
index 0cdc7f3c3..7506ac686 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2853,7 +2853,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[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",
@@ -2902,7 +2902,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",
 ]
@@ -2934,7 +2934,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",
  "serde",
@@ -2947,12 +2947,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",
@@ -2971,7 +2971,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",
@@ -2981,7 +2981,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",
@@ -2994,7 +2994,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",
@@ -3014,7 +3014,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",
@@ -3028,7 +3028,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",
@@ -3047,7 +3047,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",
@@ -3066,7 +3066,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",
@@ -3091,7 +3091,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",
@@ -3107,7 +3107,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",
@@ -3132,7 +3132,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",
@@ -3151,7 +3151,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",
@@ -3169,7 +3169,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",
@@ -3189,7 +3189,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",
@@ -3200,7 +3200,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",
@@ -3216,7 +3216,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",
@@ -3230,7 +3230,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",
 ]
@@ -3238,7 +3238,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 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",
  "serde",
@@ -3250,7 +3250,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",
@@ -3264,7 +3264,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",
@@ -3296,7 +3296,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",