diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index b12b098d..56ae7724 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -3534,7 +3534,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3585,7 +3585,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3593,7 +3593,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3604,7 +3604,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "ahash",
 ]
@@ -3612,7 +3612,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3636,7 +3636,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3647,7 +3647,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "aes",
  "hmac",
@@ -3660,7 +3660,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3679,7 +3679,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "getrandom 0.2.16",
  "hashbrown 0.16.0",
@@ -3694,7 +3694,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3712,7 +3712,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "base64",
@@ -3745,7 +3745,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "base64",
@@ -3770,7 +3770,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "quinn",
@@ -3790,7 +3790,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "socket2 0.5.10",
@@ -3807,7 +3807,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "base64",
@@ -3836,7 +3836,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "libc",
@@ -3857,7 +3857,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "nix",
@@ -3875,7 +3875,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3895,7 +3895,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3906,7 +3906,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "git-version",
  "libloading",
@@ -3923,7 +3923,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -3937,7 +3937,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "anyhow",
 ]
@@ -3945,7 +3945,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3959,7 +3959,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -3973,7 +3973,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "futures",
  "tokio",
@@ -3986,7 +3986,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4020,7 +4020,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.6.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b8553a06982ffbb05bdeb66c0d4f6572475af52"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5faa0d1fb945dd56f3d139829339a55cbf79bdf7"
 dependencies = [
  "async-trait",
  "const_format",