diff --git a/Cargo.lock b/Cargo.lock
index fb8b0e2..6949753 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2856,7 +2856,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "ahash",
  "async-trait",
@@ -2930,7 +2930,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2938,7 +2938,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "serde",
  "tracing",
@@ -2950,12 +2950,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "flume",
  "json5",
@@ -2975,7 +2975,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -2987,7 +2987,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "aes",
  "hmac",
@@ -3000,7 +3000,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3014,7 +3014,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3032,7 +3032,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "flume",
@@ -3056,7 +3056,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3085,7 +3085,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3103,7 +3103,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3131,7 +3131,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3152,7 +3152,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "futures",
@@ -3172,7 +3172,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3193,7 +3193,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3204,7 +3204,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "const_format",
  "libloading",
@@ -3220,7 +3220,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "const_format",
  "rand",
@@ -3234,7 +3234,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "anyhow",
 ]
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "futures",
  "lazy_static",
@@ -3258,7 +3258,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -3272,7 +3272,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "futures",
  "tokio",
@@ -3285,7 +3285,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-trait",
  "flume",
@@ -3317,7 +3317,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3340,7 +3340,7 @@ dependencies = [
 [[package]]
 name = "zenoh_backend_traits"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f"
 dependencies = [
  "async-std",
  "async-trait",