diff --git a/Cargo.lock b/Cargo.lock
index 75a427d1..4a8e928a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -74,9 +74,12 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "arc-swap"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "array-init"
@@ -1126,9 +1129,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010"
 
 [[package]]
 name = "jni"
@@ -2362,15 +2365,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "6af14725505314343e673e9ecb7cd7e8a36aa9791eb936235a3567cc31447ae4"
 dependencies = [
  "itoa",
  "memchr",
- "ryu",
  "serde",
  "serde_core",
+ "zmij",
 ]
 
 [[package]]
@@ -3718,7 +3721,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3770,7 +3773,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3778,7 +3781,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3790,7 +3793,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "ahash",
 ]
@@ -3798,7 +3801,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3822,7 +3825,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3833,7 +3836,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "aes",
  "hmac",
@@ -3846,7 +3849,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3865,7 +3868,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "getrandom 0.2.16",
  "hashbrown 0.16.1",
@@ -3880,7 +3883,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3898,7 +3901,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "base64",
@@ -3931,7 +3934,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "base64",
@@ -3956,7 +3959,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "quinn",
@@ -3976,7 +3979,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "socket2 0.5.10",
@@ -3993,7 +3996,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "base64",
@@ -4022,7 +4025,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "libc",
@@ -4043,7 +4046,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "nix",
@@ -4061,7 +4064,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4081,7 +4084,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4092,7 +4095,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "git-version",
  "libloading",
@@ -4109,7 +4112,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4133,7 +4136,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "anyhow",
 ]
@@ -4141,7 +4144,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4155,7 +4158,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4184,7 +4187,7 @@ dependencies = [
 [[package]]
 name = "zenoh-stats"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "ahash",
  "prometheus-client",
@@ -4197,7 +4200,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -4211,7 +4214,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "futures",
  "tokio",
@@ -4224,7 +4227,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4259,7 +4262,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#329c17d992e35e9794c75365f337735294907a0e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8c77f1daee33922f2095ff1b019b89ca857d4928"
 dependencies = [
  "async-trait",
  "const_format",
@@ -4350,3 +4353,9 @@ dependencies = [
  "quote",
  "syn 2.0.111",
 ]
+
+[[package]]
+name = "zmij"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e404bcd8afdaf006e529269d3e85a743f9480c3cef60034d77860d02964f3ba"