diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index cbcfb9af..044230f8 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2618,9 +2618,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
 
 [[package]]
 name = "untrusted"
@@ -3058,7 +3058,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-global-executor",
  "async-std",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3114,7 +3114,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "log",
  "serde",
@@ -3126,12 +3126,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "flume 0.11.0",
  "json5",
@@ -3150,7 +3150,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -3160,7 +3160,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "aes",
  "hmac",
@@ -3173,7 +3173,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "bincode",
@@ -3193,7 +3193,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3207,7 +3207,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3226,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3243,7 +3243,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-rustls",
  "async-std",
@@ -3269,7 +3269,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3285,7 +3285,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-rustls",
  "async-std",
@@ -3310,7 +3310,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3329,7 +3329,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3347,7 +3347,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3367,7 +3367,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3380,7 +3380,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "libloading",
  "log",
@@ -3393,7 +3393,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "const_format",
  "hex",
@@ -3409,7 +3409,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "anyhow",
 ]
@@ -3417,7 +3417,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "event-listener 4.0.0",
@@ -3432,7 +3432,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-executor",
  "async-global-executor",
@@ -3463,7 +3463,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2ad877ca1cb3eec4af450007e6b5b9706c5b8a32"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#40d1c1e643bb04ac9081e54165afaabaab9b0c47"
 dependencies = [
  "async-std",
  "async-trait",