diff --git a/Cargo.lock b/Cargo.lock
index 25cd4c2..b5ff0fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -563,12 +563,6 @@ 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"
@@ -2876,13 +2870,12 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "ahash",
  "async-trait",
  "bytes",
  "flume",
- "foldhash",
  "futures",
  "git-version",
  "itertools 0.13.0",
@@ -2949,7 +2942,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2957,7 +2950,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "tracing",
  "uhlc 0.8.0",
@@ -2968,12 +2961,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "json5",
  "num_cpus",
@@ -2995,7 +2988,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3006,7 +2999,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "aes",
  "hmac",
@@ -3019,7 +3012,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3038,7 +3031,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "getrandom",
  "hashbrown",
@@ -3053,7 +3046,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3070,7 +3063,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "flume",
@@ -3094,7 +3087,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3121,7 +3114,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3138,7 +3131,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3167,7 +3160,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3186,7 +3179,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "nix",
@@ -3204,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3224,7 +3217,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3235,7 +3228,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "git-version",
  "libloading",
@@ -3251,7 +3244,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "const_format",
  "rand",
@@ -3265,7 +3258,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "anyhow",
 ]
@@ -3273,7 +3266,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3287,7 +3280,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "event-listener",
  "futures",
@@ -3300,7 +3293,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "futures",
  "tokio",
@@ -3313,7 +3306,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3346,7 +3339,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "const_format",
@@ -3371,7 +3364,7 @@ dependencies = [
 [[package]]
 name = "zenoh_backend_traits"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a78dac50dab60dce1298ce2c0f67c634ee934d06"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#41739485fa5e0b78c46dd03ae06d3abcc999acd8"
 dependencies = [
  "async-trait",
  "const_format",