diff --git a/Cargo.lock b/Cargo.lock
index 40c0cb0..7bf4de2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2719,7 +2719,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",
@@ -2765,7 +2765,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",
 ]
@@ -2773,7 +2773,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",
@@ -2784,12 +2784,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",
@@ -2811,7 +2811,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",
@@ -2822,7 +2822,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",
  "hmac",
@@ -2835,7 +2835,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",
@@ -2852,7 +2852,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",
  "keyed-set",
@@ -2866,7 +2866,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",
@@ -2883,7 +2883,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",
@@ -2907,7 +2907,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",
@@ -2933,24 +2933,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",
  "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",
@@ -2979,7 +2979,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",
@@ -2998,7 +2998,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",
@@ -3016,7 +3016,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",
@@ -3036,7 +3036,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",
@@ -3047,7 +3047,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",
@@ -3063,7 +3063,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",
@@ -3090,7 +3090,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",
 ]
@@ -3098,7 +3098,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",
@@ -3111,7 +3111,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",
  "futures",
@@ -3124,7 +3124,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",
@@ -3137,7 +3137,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",
@@ -3170,7 +3170,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",