diff --git a/Cargo.lock b/Cargo.lock
index bec89a6..133ca64 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3946,7 +3946,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3992,7 +3992,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4000,7 +4000,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4011,12 +4011,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4038,7 +4038,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4049,7 +4049,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4062,7 +4062,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -4076,7 +4076,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4093,7 +4093,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "flume",
@@ -4117,7 +4117,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4143,7 +4143,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4160,7 +4160,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4189,7 +4189,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4208,7 +4208,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "nix",
@@ -4226,7 +4226,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4246,7 +4246,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4257,7 +4257,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "git-version",
  "libloading",
@@ -4293,7 +4293,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4307,7 +4307,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "anyhow",
 ]
@@ -4315,7 +4315,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4328,7 +4328,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4341,7 +4341,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "futures",
  "tokio",
@@ -4354,7 +4354,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4387,7 +4387,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#37491bbd86683641b50d35f08a1cd6365608a37f"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc"
 dependencies = [
  "async-trait",
  "const_format",