diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 7a9425d3e..6e08a5194 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -251,9 +251,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.1.23"
+version = "1.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bbb537bb4a30b90362caddba8f360c0a56bc13d3a5570028e7197204cb54a17"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
 dependencies = [
  "shlex",
 ]
@@ -2898,7 +2898,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "ahash",
  "async-trait",
@@ -2947,7 +2947,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2955,7 +2955,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "tracing",
  "uhlc",
@@ -2966,12 +2966,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "json5",
  "num_cpus",
@@ -2992,7 +2992,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3003,7 +3003,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "aes",
  "hmac",
@@ -3016,7 +3016,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3033,7 +3033,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3047,7 +3047,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3064,7 +3064,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3087,7 +3087,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3112,7 +3112,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3129,7 +3129,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3156,7 +3156,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3175,7 +3175,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "nix",
@@ -3193,7 +3193,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3213,7 +3213,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3224,7 +3224,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "git-version",
  "libloading",
@@ -3240,7 +3240,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "const_format",
  "rand",
@@ -3254,7 +3254,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "anyhow",
 ]
@@ -3262,7 +3262,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3275,7 +3275,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "event-listener",
  "futures",
@@ -3288,7 +3288,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "futures",
  "tokio",
@@ -3301,7 +3301,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3334,7 +3334,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1b59c6aad53344432d50a432e03901a903b1a79a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/zenoh-jni/Cargo.toml b/zenoh-jni/Cargo.toml
index 447b67da0..a38606df3 100644
--- a/zenoh-jni/Cargo.toml
+++ b/zenoh-jni/Cargo.toml
@@ -24,7 +24,7 @@ description = "Zenoh: Zero Overhead Pub/sub, Store/Query and Compute."
 name = "zenoh_jni"
 
 [features]
-default = ["zenoh/default", "zenoh-ext/default"]
+default = ["zenoh/default", "zenoh-ext"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
@@ -36,8 +36,8 @@ flume = "0.10.14"
 uhlc = "0.8.0"
 json5 = "0.4.1"
 serde_yaml = "0.9.19"
-zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false }
-zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false }
+zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable", "internal"], default-features = false }
+zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, optional = true }
 tracing = { version = "0.1" , features = ["log"] }
 [lib]
 name = "zenoh_jni"
diff --git a/zenoh-jni/src/lib.rs b/zenoh-jni/src/lib.rs
index 0b815ad66..6661ee551 100644
--- a/zenoh-jni/src/lib.rs
+++ b/zenoh-jni/src/lib.rs
@@ -23,6 +23,7 @@ mod scouting;
 mod session;
 mod subscriber;
 mod utils;
+#[cfg(feature = "zenoh-ext")]
 mod zbytes;
 mod zenoh_id;