diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 2efe20c68..27f729b40 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2890,7 +2890,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "ahash",
  "async-trait",
@@ -2940,7 +2940,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2948,7 +2948,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "tracing",
  "uhlc",
@@ -2959,12 +2959,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "json5",
  "num_cpus",
@@ -2985,7 +2985,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -2996,7 +2996,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "aes",
  "hmac",
@@ -3009,7 +3009,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3025,7 +3025,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3039,7 +3039,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3056,7 +3056,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3079,7 +3079,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3104,7 +3104,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3121,7 +3121,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3148,7 +3148,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3167,7 +3167,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "nix",
@@ -3185,7 +3185,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3205,7 +3205,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3216,7 +3216,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "git-version",
  "libloading",
@@ -3232,7 +3232,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "const_format",
  "rand",
@@ -3246,7 +3246,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "anyhow",
 ]
@@ -3254,7 +3254,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3267,7 +3267,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "event-listener",
  "futures",
@@ -3280,7 +3280,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "futures",
  "tokio",
@@ -3293,7 +3293,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#94ba6f326f5260905f5fcb145d33aa966996b29c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3b6d773ea76a961f8b5fb2a1b72cc1b2c13d0028"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/zenoh-jni/src/query.rs b/zenoh-jni/src/query.rs
index bc28a2970..031b1d931 100644
--- a/zenoh-jni/src/query.rs
+++ b/zenoh-jni/src/query.rs
@@ -25,10 +25,10 @@ use jni::{
 use uhlc::ID;
 use zenoh::{
     key_expr::KeyExpr,
-    prelude::Wait,
     qos::{CongestionControl, Priority},
     query::Query,
     time::{Timestamp, NTP64},
+    Wait,
 };
 
 /// Replies with `success` to a Zenoh [Query] via JNI, freeing the query in the process.
diff --git a/zenoh-jni/src/scouting.rs b/zenoh-jni/src/scouting.rs
index 9791d5ce6..e334e9546 100644
--- a/zenoh-jni/src/scouting.rs
+++ b/zenoh-jni/src/scouting.rs
@@ -19,7 +19,7 @@ use jni::{
     sys::jint,
     JNIEnv,
 };
-use zenoh::{config::WhatAmIMatcher, prelude::Wait};
+use zenoh::{config::WhatAmIMatcher, Wait};
 use zenoh::{scouting::Scout, Config};
 
 use crate::utils::{get_callback_global_ref, get_java_vm};
diff --git a/zenoh-jni/src/session.rs b/zenoh-jni/src/session.rs
index 8d29e0c41..754fb735a 100644
--- a/zenoh-jni/src/session.rs
+++ b/zenoh-jni/src/session.rs
@@ -22,11 +22,11 @@ use jni::{
 use zenoh::{
     config::Config,
     key_expr::KeyExpr,
-    prelude::Wait,
     pubsub::{Publisher, Subscriber},
     query::{Query, Queryable, ReplyError, Selector},
     sample::Sample,
     session::{Session, ZenohId},
+    Wait,
 };
 
 use crate::{