diff --git a/Cargo.lock b/Cargo.lock
index 8e8ef48f..7322548c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -288,7 +288,7 @@ dependencies = [
  "log",
  "parking",
  "polling",
- "rustix 0.37.23",
+ "rustix 0.37.25",
  "slab",
  "socket2 0.4.9",
  "waker-fn",
@@ -322,7 +322,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "event-listener",
  "futures-lite",
- "rustix 0.37.23",
+ "rustix 0.37.25",
  "signal-hook",
  "windows-sys",
 ]
@@ -2741,9 +2741,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.37.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -2864,6 +2864,16 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "secrecy"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
+dependencies = [
+ "serde",
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.9.2"
@@ -3594,9 +3604,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "tungstenite"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
 dependencies = [
  "byteorder",
  "bytes",
@@ -3617,7 +3627,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "static_assertions",
 ]
 
@@ -4054,12 +4064,13 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-global-executor",
  "async-std",
  "async-trait",
  "base64 0.21.4",
+ "const_format",
  "env_logger",
  "event-listener",
  "flume",
@@ -4118,7 +4129,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4126,7 +4137,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "log",
  "serde",
@@ -4138,16 +4149,17 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "flume",
  "json5",
  "num_cpus",
+ "secrecy",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -4161,7 +4173,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -4171,7 +4183,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "aes 0.8.3",
  "hmac 0.12.1",
@@ -4184,7 +4196,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "bincode",
@@ -4204,7 +4216,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -4218,7 +4230,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "async-trait",
@@ -4237,11 +4249,12 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "async-trait",
  "flume",
+ "lz4_flex",
  "serde",
  "typenum",
  "zenoh-buffers",
@@ -4253,11 +4266,12 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-rustls",
  "async-std",
  "async-trait",
+ "base64 0.21.4",
  "futures",
  "log",
  "quinn",
@@ -4265,6 +4279,7 @@ dependencies = [
  "rustls-native-certs",
  "rustls-pemfile",
  "rustls-webpki",
+ "secrecy",
  "zenoh-config",
  "zenoh-core",
  "zenoh-link-commons",
@@ -4277,7 +4292,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "async-trait",
@@ -4293,16 +4308,18 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-rustls",
  "async-std",
  "async-trait",
+ "base64 0.21.4",
  "futures",
  "log",
  "rustls",
  "rustls-pemfile",
  "rustls-webpki",
+ "secrecy",
  "webpki-roots",
  "zenoh-config",
  "zenoh-core",
@@ -4316,7 +4333,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "async-trait",
@@ -4335,7 +4352,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "async-trait",
@@ -4353,7 +4370,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "async-trait",
@@ -4373,7 +4390,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4415,7 +4432,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4443,7 +4460,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "libloading 0.8.0",
  "log",
@@ -4456,7 +4473,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "const_format",
  "hex",
@@ -4472,7 +4489,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "anyhow",
 ]
@@ -4480,7 +4497,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "event-listener",
@@ -4495,7 +4512,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-executor",
  "async-global-executor",
@@ -4526,11 +4543,12 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c6fec02ba9bfd065e753507724d5401c347353c8"
+source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#c0ebfff664dd925e9e16d148239eba1ade0ade06"
 dependencies = [
  "async-std",
  "async-trait",
  "clap 3.2.25",
+ "const_format",
  "flume",
  "futures",
  "hex",
diff --git a/zenoh-plugin-dds/src/lib.rs b/zenoh-plugin-dds/src/lib.rs
index 40baa067..09be1e15 100644
--- a/zenoh-plugin-dds/src/lib.rs
+++ b/zenoh-plugin-dds/src/lib.rs
@@ -32,7 +32,6 @@ use std::mem::ManuallyDrop;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 use std::time::Duration;
-use zenoh::buffers::SplitBuffer;
 use zenoh::liveliness::LivelinessToken;
 use zenoh::plugins::{Plugin, RunningPluginTrait, Runtime, ZenohPlugin};
 use zenoh::prelude::r#async::AsyncResolve;
@@ -1017,7 +1016,7 @@ impl<'a> DdsPluginRuntime<'a> {
             .expect("Failed to declare PublicationCache for Fwd Discovery");
 
         // Subscribe to remote DDS plugins publications of new Readers/Writers on admin space
-        let mut fwd_disco_sub = self
+        let fwd_disco_sub = self
             .zsession
             .declare_subscriber(fwd_discovery_subscription_key)
             .querying()