diff --git a/Cargo.lock b/Cargo.lock
index eb6f3b5..7b46ed2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3592,6 +3592,19 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
+[[package]]
+name = "tls-listener"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f1d8809f604e448c7bc53a5a0e4c2a0a20ba44cb1fb407314c8eeccb92127f9"
+dependencies = [
+ "futures-util",
+ "pin-project-lite 0.2.14",
+ "thiserror",
+ "tokio",
+ "tokio-rustls",
+]
+
 [[package]]
 name = "token-cell"
 version = "1.5.0"
@@ -4319,7 +4332,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "ahash",
  "async-trait",
@@ -4383,7 +4396,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4391,7 +4404,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4402,12 +4415,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4428,7 +4441,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4439,7 +4452,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4452,7 +4465,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "bincode",
  "flume",
@@ -4469,7 +4482,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -4483,7 +4496,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4500,7 +4513,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "flume",
@@ -4523,7 +4536,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4548,7 +4561,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4565,7 +4578,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4575,6 +4588,7 @@ dependencies = [
  "rustls-webpki",
  "secrecy",
  "socket2 0.5.7",
+ "tls-listener",
  "tokio",
  "tokio-rustls",
  "tokio-util",
@@ -4592,7 +4606,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4611,7 +4625,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "nix",
@@ -4629,7 +4643,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4649,7 +4663,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4685,7 +4699,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4710,7 +4724,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "git-version",
  "libloading",
@@ -4726,7 +4740,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4740,7 +4754,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "anyhow",
 ]
@@ -4748,7 +4762,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4761,7 +4775,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4774,7 +4788,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "futures",
  "tokio",
@@ -4787,7 +4801,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4820,7 +4834,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba"
 dependencies = [
  "async-trait",
  "const_format",