diff --git a/Cargo.lock b/Cargo.lock
index a05789b..9f99743 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 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#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "flume",
@@ -4570,7 +4570,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4596,7 +4596,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4613,7 +4613,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4642,7 +4642,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4661,7 +4661,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "nix",
@@ -4679,7 +4679,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4699,7 +4699,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4710,7 +4710,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4760,7 +4760,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "git-version",
  "libloading",
@@ -4776,7 +4776,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4790,7 +4790,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "anyhow",
 ]
@@ -4798,7 +4798,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4811,7 +4811,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4824,7 +4824,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "futures",
  "tokio",
@@ -4837,7 +4837,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4870,7 +4870,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9a84e6d875c866d05d7b497e9fc090ec672f6813"
 dependencies = [
  "async-trait",
  "const_format",