diff --git a/Cargo.lock b/Cargo.lock
index 75b73e3c8..d3d98d78a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -285,6 +285,9 @@ name = "bitflags"
 version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "block-buffer"
@@ -1690,6 +1693,18 @@ dependencies = [
  "cache-padded",
 ]
 
+[[package]]
+name = "ron"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
+dependencies = [
+ "base64",
+ "bitflags 2.4.2",
+ "serde",
+ "serde_derive",
+]
+
 [[package]]
 name = "rsa"
 version = "0.9.2"
@@ -2961,7 +2976,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3012,7 +3027,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3044,7 +3059,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "serde",
  "tracing",
@@ -3057,12 +3072,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "flume",
  "json5",
@@ -3082,7 +3097,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3094,7 +3109,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "aes",
  "hmac",
@@ -3107,7 +3122,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "bincode",
  "flume",
@@ -3128,7 +3143,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3142,7 +3157,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3160,7 +3175,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "flume",
@@ -3183,7 +3198,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "base64",
@@ -3211,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3229,7 +3244,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "base64",
@@ -3257,7 +3272,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3278,7 +3293,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "futures",
@@ -3298,7 +3313,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3319,7 +3334,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3330,7 +3345,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "const_format",
  "libloading",
@@ -3346,7 +3361,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "const_format",
  "rand",
@@ -3360,7 +3375,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "anyhow",
 ]
@@ -3368,19 +3383,23 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "futures",
  "lazy_static",
+ "libc",
+ "ron",
+ "serde",
  "tokio",
  "zenoh-collections",
+ "zenoh-macros",
  "zenoh-result",
 ]
 
 [[package]]
 name = "zenoh-shm"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "serde",
  "shared_memory",
@@ -3392,7 +3411,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -3406,7 +3425,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "futures",
  "tokio",
@@ -3419,7 +3438,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-trait",
  "flume",
@@ -3452,7 +3471,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#81217c779274f6a67ac645ef8082b09a0a4a5320"
 dependencies = [
  "async-std",
  "async-trait",