diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 3d9db202..c344d669 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -1803,6 +1803,15 @@ dependencies = [
  "zerocopy 0.7.35",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.101"
@@ -2427,6 +2436,12 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sha2-const-stable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f179d4e11094a893b82fff208f74d448a7512f99f5a0acbd5c679b705f83ed9"
+
 [[package]]
 name = "sha3"
 version = "0.10.8"
@@ -2537,6 +2552,41 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stabby"
+version = "36.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b7e94eaf470c2e76b5f15fb2fb49714471a36cc512df5ee231e62e82ec79f8"
+dependencies = [
+ "rustversion",
+ "stabby-abi",
+]
+
+[[package]]
+name = "stabby-abi"
+version = "36.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc7a63b8276b54e51bfffe3d85da56e7906b2dcfcb29018a8ab666c06734c1a"
+dependencies = [
+ "rustc_version",
+ "rustversion",
+ "sha2-const-stable",
+ "stabby-macros",
+]
+
+[[package]]
+name = "stabby-macros"
+version = "36.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eecb7ec5611ec93ec79d120fbe55f31bea234dc1bed1001d4a071bb688651615"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "rand",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -2808,6 +2858,23 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+
+[[package]]
+name = "toml_edit"
+version = "0.22.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+dependencies = [
+ "indexmap 2.5.0",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -3426,6 +3493,15 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "winnow"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.46.0"
@@ -3488,7 +3564,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3538,7 +3614,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3546,7 +3622,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3557,7 +3633,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "ahash",
 ]
@@ -3565,7 +3641,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3589,7 +3665,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3600,7 +3676,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "aes",
  "hmac",
@@ -3613,7 +3689,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3632,7 +3708,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "getrandom 0.2.15",
  "hashbrown 0.16.0",
@@ -3647,7 +3723,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3665,7 +3741,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3698,7 +3774,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3723,7 +3799,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "quinn",
@@ -3743,7 +3819,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -3760,7 +3836,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3789,7 +3865,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "libc",
@@ -3810,7 +3886,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "nix",
@@ -3828,7 +3904,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3848,7 +3924,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3859,11 +3935,12 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "git-version",
  "libloading",
  "serde",
+ "stabby",
  "tracing",
  "zenoh-config",
  "zenoh-keyexpr",
@@ -3875,7 +3952,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "const_format",
  "rand",
@@ -3889,7 +3966,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "anyhow",
 ]
@@ -3897,7 +3974,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3911,7 +3988,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -3925,7 +4002,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "futures",
  "tokio",
@@ -3938,7 +4015,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3972,7 +4049,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.5.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e36d6d3dd919eeb2ae1e5e14ad4853aa086b9544"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c85edf23a85e1e977d4ace37a4ae540b8603370f"
 dependencies = [
  "async-trait",
  "const_format",
@@ -3983,6 +4060,7 @@ dependencies = [
  "libc",
  "libloading",
  "pnet_datalink",
+ "schemars 0.8.21",
  "serde",
  "serde_json",
  "shellexpand",