diff --git a/Cargo.lock b/Cargo.lock
index f1ef280e..6d151b99 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2274,12 +2274,6 @@ dependencies = [
  "syn 2.0.111",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2498,9 +2492,9 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
 [[package]]
 name = "siphasher"
@@ -3724,7 +3718,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3776,7 +3770,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3784,7 +3778,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3796,7 +3790,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "ahash",
 ]
@@ -3804,7 +3798,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3828,7 +3822,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3839,7 +3833,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "aes",
  "hmac",
@@ -3852,7 +3846,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3871,7 +3865,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "getrandom 0.2.16",
  "hashbrown 0.16.1",
@@ -3886,7 +3880,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3904,7 +3898,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "base64",
@@ -3937,7 +3931,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "base64",
@@ -3962,7 +3956,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "quinn",
@@ -3982,7 +3976,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "socket2 0.5.10",
@@ -3999,7 +3993,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "base64",
@@ -4028,7 +4022,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "libc",
@@ -4049,7 +4043,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "nix",
@@ -4067,7 +4061,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4087,7 +4081,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4098,7 +4092,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "git-version",
  "libloading",
@@ -4115,7 +4109,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4139,7 +4133,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "anyhow",
 ]
@@ -4147,7 +4141,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4161,7 +4155,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4190,11 +4184,10 @@ dependencies = [
 [[package]]
 name = "zenoh-stats"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "ahash",
  "prometheus-client",
- "scoped-tls",
  "serde_json",
  "smallvec",
  "zenoh-keyexpr",
@@ -4204,7 +4197,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -4218,7 +4211,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "futures",
  "tokio",
@@ -4231,7 +4224,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4266,7 +4259,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.7.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#12138730a7fdbdaf51d9ecbeedd8da297f6490e3"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6199ff0c0b0bd5bd046b7fc26e794d1f44b25289"
 dependencies = [
  "async-trait",
  "const_format",