diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index ae6d6d29..da045241 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -863,8 +863,6 @@ version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
- "allocator-api2",
- "equivalent",
  "foldhash 0.1.5",
 ]
 
@@ -1128,13 +1126,14 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.16.0",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1650,13 +1649,13 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 dependencies = [
  "fixedbitset",
  "hashbrown 0.15.5",
- "indexmap 2.5.0",
+ "indexmap 2.11.4",
  "serde",
 ]
 
@@ -2379,7 +2378,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.11.4",
  "schemars 0.9.0",
  "schemars 1.0.4",
  "serde",
@@ -2407,7 +2406,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.11.4",
  "itoa",
  "ryu",
  "serde",
@@ -2870,7 +2869,7 @@ version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.11.4",
  "toml_datetime",
  "winnow",
 ]
@@ -3564,7 +3563,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3615,7 +3614,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3623,7 +3622,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3634,7 +3633,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "ahash",
 ]
@@ -3642,7 +3641,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3666,7 +3665,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3677,7 +3676,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "aes",
  "hmac",
@@ -3690,7 +3689,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3709,7 +3708,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "getrandom 0.2.15",
  "hashbrown 0.16.0",
@@ -3724,7 +3723,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3742,7 +3741,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "base64",
@@ -3775,7 +3774,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "base64",
@@ -3800,7 +3799,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "quinn",
@@ -3820,7 +3819,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -3837,7 +3836,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "base64",
@@ -3866,7 +3865,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "libc",
@@ -3887,7 +3886,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "nix",
@@ -3905,7 +3904,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3925,7 +3924,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3936,7 +3935,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "git-version",
  "libloading",
@@ -3953,7 +3952,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "const_format",
  "rand",
@@ -3967,7 +3966,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "anyhow",
 ]
@@ -3975,7 +3974,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3989,7 +3988,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -4003,7 +4002,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "futures",
  "tokio",
@@ -4016,7 +4015,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4050,7 +4049,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8f14db68decef74a8e2644427d680cfd4f8f0588"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1bd82eeef7d9b2df0d96dbbaf947ac75c90571aa"
 dependencies = [
  "async-trait",
  "const_format",