diff --git a/Cargo.lock b/Cargo.lock
index 9acbcf010..c236a9fe4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2976,7 +2976,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3027,7 +3027,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3059,7 +3059,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "serde",
  "tracing",
@@ -3072,12 +3072,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "flume",
  "json5",
@@ -3097,7 +3097,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3109,7 +3109,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "aes",
  "hmac",
@@ -3122,7 +3122,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "bincode",
  "flume",
@@ -3143,7 +3143,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3157,7 +3157,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3175,7 +3175,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "flume",
@@ -3199,7 +3199,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "base64",
@@ -3229,7 +3229,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3247,7 +3247,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "base64",
@@ -3275,7 +3275,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3296,7 +3296,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "futures",
@@ -3316,7 +3316,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3337,7 +3337,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3348,7 +3348,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "const_format",
  "libloading",
@@ -3364,7 +3364,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "const_format",
  "rand",
@@ -3378,7 +3378,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "anyhow",
 ]
@@ -3386,7 +3386,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "futures",
  "lazy_static",
@@ -3402,7 +3402,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "serde",
  "shared_memory",
@@ -3414,7 +3414,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -3428,7 +3428,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "futures",
  "tokio",
@@ -3441,7 +3441,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-trait",
  "flume",
@@ -3474,7 +3474,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/0.11.0#c4c58423940a50d864b5a255592f7349eefa1c75"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=support/0.11.0#613f37ffd766c92c883825070010e5e1bc3440e8"
 dependencies = [
  "async-std",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 68cc7c42b..85ab9a2c1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,10 +49,10 @@ libc = "0.2.139"
 rand = "0.8.5"
 spin = "0.9.5"
 # shared-memory enabled for zenoh even if zenoh-c "shared-memory" feature is disabled. This is to make "std::mem::transmute" work for `ZSLice`
-zenoh = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/0.11.0", features = ["shared-memory", "unstable"], default-features = false }
-zenoh-protocol = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/0.11.0", features = ["shared-memory"] }
-zenoh-util = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/0.11.0" }
-zenoh-ext = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/0.11.0", features = ["unstable"] }
+zenoh = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "support/0.11.0", features = ["shared-memory", "unstable"], default-features = false }
+zenoh-protocol = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "support/0.11.0", features = ["shared-memory"] }
+zenoh-util = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "support/0.11.0" }
+zenoh-ext = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "support/0.11.0", features = ["unstable"] }
 tracing = "0.1"
 
 [build-dependencies]
diff --git a/Cargo.toml.in b/Cargo.toml.in
index 413c02372..7c182b0cb 100644
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@@ -49,10 +49,10 @@ libc = "0.2.139"
 rand = "0.8.5"
 spin = "0.9.5"
 # shared-memory enabled for zenoh even if zenoh-c "shared-memory" feature is disabled. This is to make "std::mem::transmute" work for `ZSLice`
-zenoh = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/0.11.0", features = ["shared-memory", "unstable"], default-features = false }
-zenoh-protocol = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/0.11.0", features = ["shared-memory"] }
-zenoh-util = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/0.11.0" }
-zenoh-ext = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/0.11.0", features = ["unstable"] }
+zenoh = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "support/0.11.0", features = ["shared-memory", "unstable"], default-features = false }
+zenoh-protocol = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "support/0.11.0", features = ["shared-memory"] }
+zenoh-util = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "support/0.11.0" }
+zenoh-ext = { version = "0.11.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "support/0.11.0", features = ["unstable"] }
 tracing = "0.1"
 
 [build-dependencies]