diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 3ad90dca..b22752c8 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2868,7 +2868,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "ahash",
  "async-trait",
@@ -2914,7 +2914,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2922,7 +2922,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "tracing",
  "uhlc",
@@ -2933,12 +2933,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "json5",
  "num_cpus",
@@ -2959,7 +2959,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -2970,7 +2970,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "aes",
  "hmac",
@@ -2983,7 +2983,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3000,7 +3000,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3014,7 +3014,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3031,7 +3031,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3054,7 +3054,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3079,7 +3079,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3096,7 +3096,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3124,7 +3124,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3143,7 +3143,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "nix",
@@ -3161,7 +3161,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3181,7 +3181,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3192,7 +3192,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "git-version",
  "libloading",
@@ -3208,7 +3208,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "const_format",
  "rand",
@@ -3222,7 +3222,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "anyhow",
 ]
@@ -3230,7 +3230,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3243,7 +3243,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "event-listener",
  "futures",
@@ -3256,7 +3256,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "futures",
  "tokio",
@@ -3269,7 +3269,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3302,7 +3302,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e73a89d3bab5d3960159ddfc0ef315407d2fdf7e"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#840ee7362350cb9dbc48f438a910986d831971cd"
 dependencies = [
  "async-trait",
  "const_format",