diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 79f6080a..58e85e06 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -3564,12 +3564,13 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "ahash",
  "arc-swap",
  "async-trait",
  "bytes",
+ "const_format",
  "flume 0.11.1",
  "futures",
  "git-version",
@@ -3614,7 +3615,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3622,7 +3623,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3633,7 +3634,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "ahash",
 ]
@@ -3641,7 +3642,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3665,7 +3666,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3676,7 +3677,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "aes",
  "hmac",
@@ -3689,7 +3690,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3708,7 +3709,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "getrandom 0.2.15",
  "hashbrown 0.16.0",
@@ -3723,7 +3724,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3741,7 +3742,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "base64",
@@ -3774,7 +3775,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "base64",
@@ -3799,7 +3800,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "quinn",
@@ -3819,7 +3820,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -3836,7 +3837,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "base64",
@@ -3865,7 +3866,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "libc",
@@ -3886,7 +3887,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "nix",
@@ -3904,7 +3905,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3924,7 +3925,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3935,7 +3936,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "git-version",
  "libloading",
@@ -3952,7 +3953,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "const_format",
  "rand",
@@ -3966,7 +3967,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "anyhow",
 ]
@@ -3974,7 +3975,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3988,7 +3989,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -4002,7 +4003,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "futures",
  "tokio",
@@ -4015,7 +4016,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4049,7 +4050,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.6.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b0cef3049bdad06b113af4156477560cae327ee"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f604d5c98218b8e44bccacac568e99b53d10f5d7"
 dependencies = [
  "async-trait",
  "const_format",