diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index c527001a..434a9485 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2038,9 +2038,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.34"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "log",
  "once_cell",
@@ -3558,7 +3558,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3609,7 +3609,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3617,7 +3617,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3628,7 +3628,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "ahash",
 ]
@@ -3636,7 +3636,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3660,7 +3660,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3671,7 +3671,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "aes",
  "hmac",
@@ -3684,7 +3684,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3703,7 +3703,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "getrandom 0.2.16",
  "hashbrown 0.16.0",
@@ -3718,7 +3718,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3736,7 +3736,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3769,7 +3769,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3794,7 +3794,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "quinn",
@@ -3814,7 +3814,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "socket2 0.5.10",
@@ -3831,7 +3831,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3860,7 +3860,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "libc",
@@ -3881,7 +3881,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "nix",
@@ -3899,7 +3899,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3919,7 +3919,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3930,7 +3930,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "git-version",
  "libloading",
@@ -3947,7 +3947,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -3961,7 +3961,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "anyhow",
 ]
@@ -3969,7 +3969,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3983,7 +3983,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -3997,7 +3997,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "futures",
  "tokio",
@@ -4010,7 +4010,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4044,7 +4044,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b59a1d4c5d3b797555caab62bd9171953473b052"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7cbd4557ea2389e04f670a1e1522f1fd4dcbc4f"
 dependencies = [
  "async-trait",
  "const_format",