diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 3c366fb2..6c22f3da 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2970,7 +2970,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3020,7 +3020,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3028,7 +3028,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "serde",
  "tracing",
@@ -3040,12 +3040,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "flume 0.11.0",
  "json5",
@@ -3065,7 +3065,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3077,7 +3077,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "aes",
  "hmac",
@@ -3090,7 +3090,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3111,7 +3111,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3125,7 +3125,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3143,7 +3143,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3167,7 +3167,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "base64",
@@ -3196,7 +3196,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3214,7 +3214,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "base64",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3263,7 +3263,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "futures",
@@ -3283,7 +3283,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3304,7 +3304,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3315,7 +3315,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "const_format",
  "libloading",
@@ -3331,7 +3331,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "const_format",
  "rand",
@@ -3345,7 +3345,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "anyhow",
 ]
@@ -3353,7 +3353,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "futures",
  "lazy_static",
@@ -3369,7 +3369,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -3383,7 +3383,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "futures",
  "tokio",
@@ -3396,7 +3396,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3428,7 +3428,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#93f93d2d67f25886a25e83922a534694c2135669"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2500e5a62d8940cbfbc36f27c07360f91ba28c2d"
 dependencies = [
  "async-std",
  "async-trait",