diff --git a/Cargo.lock b/Cargo.lock
index a9366bf..7c6bdb2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1198,6 +1198,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -4352,12 +4358,13 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "ahash",
  "async-trait",
  "bytes",
  "flume",
+ "foldhash",
  "futures",
  "git-version",
  "itertools 0.13.0",
@@ -4417,7 +4424,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4425,7 +4432,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4436,12 +4443,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4463,7 +4470,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4474,7 +4481,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4487,7 +4494,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "bincode",
@@ -4506,8 +4513,9 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
+ "getrandom 0.2.15",
  "hashbrown 0.14.5",
  "keyed-set",
  "rand 0.8.5",
@@ -4520,7 +4528,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4537,7 +4545,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "flume",
@@ -4561,7 +4569,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4588,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#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4605,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#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4634,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#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4653,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#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "nix",
@@ -4671,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#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4691,7 +4699,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4727,7 +4735,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4752,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#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "git-version",
  "libloading",
@@ -4768,7 +4776,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4782,7 +4790,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "anyhow",
 ]
@@ -4790,12 +4798,13 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "lazy_static",
  "ron",
  "serde",
  "tokio",
+ "tracing",
  "zenoh-macros",
  "zenoh-result",
 ]
@@ -4803,7 +4812,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4816,7 +4825,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "futures",
  "tokio",
@@ -4829,7 +4838,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4862,7 +4871,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7acc26c8bf226cc762139e75bafce15004f4dacb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#26d67de043efe327befd0bbfb29c76a5157f1baf"
 dependencies = [
  "async-trait",
  "const_format",