diff --git a/Cargo.lock b/Cargo.lock
index 0aeed46..a117006 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4332,7 +4332,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "ahash",
  "async-trait",
@@ -4396,7 +4396,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4404,7 +4404,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4415,12 +4415,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4442,7 +4442,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4453,7 +4453,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4466,7 +4466,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "bincode",
  "flume",
@@ -4483,7 +4483,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -4497,7 +4497,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4514,7 +4514,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "flume",
@@ -4538,7 +4538,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4564,24 +4564,24 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
  "tokio",
  "tokio-util",
  "tracing",
+ "zenoh-config",
  "zenoh-core",
  "zenoh-link-commons",
  "zenoh-protocol",
  "zenoh-result",
- "zenoh-util",
 ]
 
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4610,7 +4610,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4629,7 +4629,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "nix",
@@ -4647,7 +4647,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4667,7 +4667,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4703,7 +4703,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4728,7 +4728,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "git-version",
  "libloading",
@@ -4744,7 +4744,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4758,7 +4758,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "anyhow",
 ]
@@ -4766,7 +4766,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4779,7 +4779,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4792,7 +4792,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "futures",
  "tokio",
@@ -4805,7 +4805,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4838,7 +4838,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#64e8caa298164ce543682c30211862188d262e44"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "const_format",