diff --git a/Cargo.lock b/Cargo.lock
index 1486aca..a1f6131 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5014,7 +5014,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "ahash",
  "async-trait",
@@ -5076,7 +5076,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "zenoh-collections",
 ]
@@ -5084,7 +5084,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "tracing",
  "uhlc",
@@ -5095,12 +5095,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "json5",
  "num_cpus",
@@ -5121,7 +5121,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -5132,7 +5132,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -5145,7 +5145,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -5159,7 +5159,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -5176,7 +5176,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "flume",
@@ -5184,6 +5184,7 @@ dependencies = [
  "rustls",
  "rustls-webpki",
  "serde",
+ "time 0.3.36",
  "tokio",
  "tokio-util",
  "tracing",
@@ -5199,7 +5200,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5209,6 +5210,7 @@ dependencies = [
  "rustls-pki-types",
  "rustls-webpki",
  "secrecy",
+ "time 0.3.36",
  "tokio",
  "tokio-util",
  "tracing",
@@ -5224,7 +5226,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -5241,7 +5243,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5251,6 +5253,7 @@ dependencies = [
  "rustls-webpki",
  "secrecy",
  "socket2 0.5.7",
+ "time 0.3.36",
  "tls-listener",
  "tokio",
  "tokio-rustls",
@@ -5269,7 +5272,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -5288,7 +5291,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "nix",
@@ -5306,7 +5309,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -5326,7 +5329,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5337,7 +5340,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "anyhow",
  "async-std",
@@ -5394,7 +5397,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "git-version",
  "libloading",
@@ -5410,7 +5413,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -5424,7 +5427,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "anyhow",
 ]
@@ -5432,7 +5435,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "lazy_static",
  "ron",
@@ -5445,7 +5448,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "event-listener 5.3.1",
  "futures 0.3.30",
@@ -5458,7 +5461,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "futures 0.3.30",
  "tokio",
@@ -5471,7 +5474,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -5504,7 +5507,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#453b7b88d84fd3def3f4961930100ee7c172b106"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3404e05baadecd9a228499c8f395e9d49aae22af"
 dependencies = [
  "async-trait",
  "const_format",