diff --git a/Cargo.lock b/Cargo.lock
index cbec5631..be83e4a8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -74,9 +74,9 @@ checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "arc-swap"
-version = "1.8.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f3647c145568cec02c42054e07bdf9a5a698e15b466fb2341bfc393cd24aa5"
+checksum = "a07d1f37ff60921c83bdfc7407723bdefe89b44b98a9b772f225c8f9d67141a6"
 dependencies = [
  "rustversion",
 ]
@@ -1107,7 +1107,7 @@ dependencies = [
  "cesu8",
  "cfg-if",
  "combine",
- "jni-sys",
+ "jni-sys 0.3.1",
  "log",
  "thiserror 1.0.69",
  "walkdir",
@@ -1116,9 +1116,31 @@ dependencies = [
 
 [[package]]
 name = "jni-sys"
-version = "0.3.0"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
 
 [[package]]
 name = "js-sys"
@@ -3830,7 +3852,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3881,7 +3903,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3889,7 +3911,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3901,7 +3923,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "ahash",
 ]
@@ -3909,7 +3931,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3934,7 +3956,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3945,7 +3967,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "aes",
  "hmac",
@@ -3958,7 +3980,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3977,7 +3999,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "getrandom 0.2.17",
  "hashbrown 0.16.1",
@@ -3992,7 +4014,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4010,7 +4032,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "base64",
@@ -4043,7 +4065,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "base64",
@@ -4068,7 +4090,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "quinn",
@@ -4088,7 +4110,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "socket2 0.5.10",
@@ -4105,7 +4127,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "base64",
@@ -4134,7 +4156,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "libc",
@@ -4155,7 +4177,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "nix",
@@ -4173,7 +4195,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4193,7 +4215,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4204,7 +4226,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "git-version",
  "libloading",
@@ -4221,7 +4243,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4246,7 +4268,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "anyhow",
 ]
@@ -4254,7 +4276,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4268,7 +4290,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4297,7 +4319,7 @@ dependencies = [
 [[package]]
 name = "zenoh-stats"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "ahash",
  "prometheus-client",
@@ -4310,7 +4332,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -4324,7 +4346,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "futures",
  "tokio",
@@ -4337,7 +4359,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4372,7 +4394,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.8.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fed213338fd6c214ade211f8a43e567f2cf2287a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#69b410e705e94531902a41a51b74d0c7b098264c"
 dependencies = [
  "async-trait",
  "const_format",