diff --git a/Cargo.lock b/Cargo.lock
index 34710c4..179a5f5 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#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 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#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 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#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 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#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+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#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "json5",
  "num_cpus",
@@ -5112,6 +5112,7 @@ dependencies = [
  "uhlc",
  "validated_struct",
  "zenoh-core",
+ "zenoh-keyexpr",
  "zenoh-macros",
  "zenoh-protocol",
  "zenoh-result",
@@ -5121,7 +5122,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -5132,7 +5133,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -5145,7 +5146,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -5159,7 +5160,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -5176,7 +5177,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "flume",
@@ -5200,7 +5201,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5226,24 +5227,24 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+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#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5272,7 +5273,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -5291,7 +5292,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "nix",
@@ -5309,7 +5310,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -5329,7 +5330,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5340,7 +5341,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "anyhow",
  "async-std",
@@ -5397,7 +5398,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "git-version",
  "libloading",
@@ -5413,7 +5414,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -5427,7 +5428,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "anyhow",
 ]
@@ -5435,7 +5436,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "lazy_static",
  "ron",
@@ -5448,7 +5449,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "event-listener 5.3.1",
  "futures 0.3.30",
@@ -5461,7 +5462,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "futures 0.3.30",
  "tokio",
@@ -5474,7 +5475,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -5507,7 +5508,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c764bf9be0423b7d90f534209b0be2b8017b71ed"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#233240622f548c18fe41450144010ad1b7e1fe17"
 dependencies = [
  "async-trait",
  "const_format",