diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index f915918e..28d55869 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -1170,6 +1170,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nonempty-collections"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f301452dbaf00f14ca0c8204e46cf0c9a96f53543ac72cefa9b4d91c19e0ac"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -3058,7 +3067,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3070,6 +3079,7 @@ dependencies = [
  "itertools",
  "json5",
  "lazy_static",
+ "nonempty-collections",
  "once_cell",
  "paste",
  "petgraph",
@@ -3106,7 +3116,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3114,7 +3124,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3125,14 +3135,15 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 
 [[package]]
 name = "zenoh-config"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "json5",
+ "nonempty-collections",
  "num_cpus",
  "secrecy",
  "serde",
@@ -3153,7 +3164,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3164,7 +3175,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "aes",
  "hmac",
@@ -3177,7 +3188,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3196,7 +3207,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "getrandom",
  "hashbrown 0.14.5",
@@ -3211,7 +3222,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3228,7 +3239,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3252,7 +3263,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3279,7 +3290,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3296,7 +3307,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3325,7 +3336,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3344,7 +3355,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "nix",
@@ -3362,7 +3373,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3382,7 +3393,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3393,7 +3404,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "git-version",
  "libloading",
@@ -3409,7 +3420,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "const_format",
  "rand",
@@ -3423,7 +3434,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "anyhow",
 ]
@@ -3431,7 +3442,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3445,7 +3456,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -3459,7 +3470,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "futures",
  "tokio",
@@ -3472,7 +3483,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3505,7 +3516,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.3.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0e0c5d9b277aaa9dfcec2d66d2a05ef7206ec8ba"
 dependencies = [
  "async-trait",
  "const_format",