diff --git a/Cargo.lock b/Cargo.lock
index cf651da..0bb8f84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4364,7 +4364,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "ahash",
  "async-trait",
@@ -4429,7 +4429,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4437,7 +4437,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4448,12 +4448,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4474,7 +4474,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4485,7 +4485,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4498,7 +4498,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "bincode",
  "flume",
@@ -4515,7 +4515,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -4529,7 +4529,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4546,7 +4546,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "flume",
@@ -4569,7 +4569,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4594,7 +4594,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4611,7 +4611,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4639,7 +4639,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4658,7 +4658,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "nix",
@@ -4676,7 +4676,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4696,7 +4696,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4707,7 +4707,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4757,7 +4757,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "git-version",
  "libloading",
@@ -4773,7 +4773,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4787,7 +4787,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "anyhow",
 ]
@@ -4795,7 +4795,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4808,7 +4808,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4821,7 +4821,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "futures",
  "tokio",
@@ -4834,7 +4834,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4867,7 +4867,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "const_format",