diff --git a/Cargo.lock b/Cargo.lock
index e41894ba4..65ec8f8af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3718,7 +3718,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3765,7 +3765,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3801,7 +3801,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3813,12 +3813,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "json5",
  "num_cpus",
@@ -3839,7 +3839,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3850,7 +3850,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "aes",
  "hmac",
@@ -3863,7 +3863,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "bincode",
  "flume",
@@ -3880,7 +3880,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3894,7 +3894,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3914,7 +3914,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "flume",
@@ -3938,7 +3938,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3964,7 +3964,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-serial"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3982,7 +3982,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -3999,7 +3999,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4028,7 +4028,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4047,7 +4047,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixpipe"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4069,7 +4069,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "nix 0.29.0",
@@ -4087,7 +4087,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-vsock"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "libc",
@@ -4105,7 +4105,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4125,7 +4125,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4136,7 +4136,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "git-version",
  "libloading",
@@ -4152,7 +4152,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "const_format",
  "rand",
@@ -4166,7 +4166,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "anyhow",
 ]
@@ -4174,7 +4174,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4187,7 +4187,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4210,7 +4210,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4223,7 +4223,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "futures",
  "tokio",
@@ -4236,7 +4236,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4270,7 +4270,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/build-resources/opaque-types/Cargo.lock b/build-resources/opaque-types/Cargo.lock
index ed2a5f546..277a58850 100644
--- a/build-resources/opaque-types/Cargo.lock
+++ b/build-resources/opaque-types/Cargo.lock
@@ -3110,7 +3110,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3157,7 +3157,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3165,7 +3165,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3177,12 +3177,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "json5",
  "num_cpus",
@@ -3203,7 +3203,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3214,7 +3214,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "aes",
  "hmac",
@@ -3227,7 +3227,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "bincode",
  "flume",
@@ -3244,7 +3244,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -3258,7 +3258,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3278,7 +3278,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "flume",
@@ -3302,7 +3302,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3328,7 +3328,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-serial"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3346,7 +3346,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3363,7 +3363,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3392,7 +3392,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3411,7 +3411,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixpipe"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -3433,7 +3433,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "nix 0.29.0",
@@ -3451,7 +3451,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-vsock"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "libc",
@@ -3469,7 +3469,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3489,7 +3489,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3500,7 +3500,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "git-version",
  "libloading",
@@ -3516,7 +3516,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "const_format",
  "rand",
@@ -3530,7 +3530,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "anyhow",
 ]
@@ -3538,7 +3538,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3551,7 +3551,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -3574,7 +3574,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "event-listener",
  "futures",
@@ -3587,7 +3587,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "futures",
  "tokio",
@@ -3600,7 +3600,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3634,7 +3634,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#488cca2d40ad4c223a2df1c148289c65116ffad2"
+source = "git+https://github.com/DenisBiryukov91/zenoh.git?branch=querier#d2dd91208733d951763abad3a5dd130e93a07af9"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/build-resources/opaque-types/src/lib.rs b/build-resources/opaque-types/src/lib.rs
index 2a396f898..d41d0689c 100644
--- a/build-resources/opaque-types/src/lib.rs
+++ b/build-resources/opaque-types/src/lib.rs
@@ -14,7 +14,7 @@ use zenoh::{
     handlers::{FifoChannelHandler, RingChannelHandler},
     key_expr::KeyExpr,
     pubsub::{Publisher, Subscriber},
-    query::{Querier, Query, Queryable, Reply, ReplyError},
+    query::{Query, Queryable, Reply, ReplyError},
     sample::Sample,
     scouting::Hello,
     session::{Session, ZenohId},
@@ -22,7 +22,7 @@ use zenoh::{
 };
 #[cfg(feature = "unstable")]
 use zenoh::{
-    liveliness::LivelinessToken, matching::MatchingListener, sample::SourceInfo,
+    liveliness::LivelinessToken, matching::MatchingListener, query::Querier, sample::SourceInfo,
     session::EntityGlobalId,
 };
 #[cfg(all(feature = "shared-memory", feature = "unstable"))]
@@ -130,10 +130,12 @@ get_opaque_type_data!(Option<Queryable<()>>, z_owned_queryable_t);
 /// A loaned Zenoh queryable.
 get_opaque_type_data!(Queryable<()>, z_loaned_queryable_t);
 
+#[cfg(feature = "unstable")]
 /// An owned Zenoh querier.
 ///
 /// Sends queries to matching queryables.
 get_opaque_type_data!(Option<Querier>, z_owned_querier_t);
+#[cfg(feature = "unstable")]
 /// A loaned Zenoh queryable.
 get_opaque_type_data!(Querier, z_loaned_querier_t);
 
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index db8f3a714..e687b3f82 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -27,6 +27,7 @@ foreach(file ${files})
             (${target} MATCHES "^.*_liveliness.*$") 
             OR (${target} MATCHES "^.*_pub_cache.*$") 
             OR (${target} MATCHES "^.*_query_sub.*$")
+            OR (${target} MATCHES "^.*_querier.*$")
         )
             continue()
         endif()
diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
index 6089e8709..1747fa7dc 100644
--- a/include/zenoh_commons.h
+++ b/include/zenoh_commons.h
@@ -593,8 +593,10 @@ typedef struct z_query_consolidation_t {
   enum z_consolidation_mode_t mode;
 } z_query_consolidation_t;
 /**
- * Options passed to the `z_declare_querier()` function.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Options passed to the `z_declare_querier()` function.
  */
+#if defined(Z_FEATURE_UNSTABLE_API)
 typedef struct z_querier_options_t {
   /**
    * The Queryables that should be target of the querier queries.
@@ -637,6 +639,7 @@ typedef struct z_querier_options_t {
    */
   uint64_t timeout_ms;
 } z_querier_options_t;
+#endif
 /**
  * Options passed to the `z_delete()` function.
  */
@@ -881,12 +884,11 @@ typedef struct z_put_options_t {
    */
   struct z_moved_bytes_t *attachment;
 } z_put_options_t;
-typedef struct z_moved_querier_t {
-  struct z_owned_querier_t _this;
-} z_moved_querier_t;
 /**
- * Options passed to the `z_querier_get()` function.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Options passed to the `z_querier_get()` function.
  */
+#if defined(Z_FEATURE_UNSTABLE_API)
 typedef struct z_querier_get_options_t {
   /**
    * An optional payload to attach to the query.
@@ -909,6 +911,7 @@ typedef struct z_querier_get_options_t {
    */
   struct z_moved_bytes_t *attachment;
 } z_querier_get_options_t;
+#endif
 typedef struct z_moved_query_t {
   struct z_owned_query_t _this;
 } z_moved_query_t;
@@ -2036,7 +2039,8 @@ z_result_t z_declare_publisher(const struct z_loaned_session_t *session,
                                const struct z_loaned_keyexpr_t *key_expr,
                                struct z_publisher_options_t *options);
 /**
- * Constructs and declares a querier on the given key expression.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Constructs and declares a querier on the given key expression.
  *
  * The queries can be send with the help of the `z_querier_get()` function.
  *
@@ -2047,11 +2051,13 @@ z_result_t z_declare_publisher(const struct z_loaned_session_t *session,
  *
  * @return 0 in case of success, negative error code otherwise.
  */
+#if defined(Z_FEATURE_UNSTABLE_API)
 ZENOHC_API
 z_result_t z_declare_querier(const struct z_loaned_session_t *session,
-                             struct z_owned_querier_t *querier,
+                             z_owned_querier_t *querier,
                              const struct z_loaned_keyexpr_t *key_expr,
                              struct z_querier_options_t *options);
+#endif
 /**
  * Constructs a Queryable for the given key expression.
  *
@@ -2902,13 +2908,21 @@ ZENOHC_API bool z_internal_publisher_check(const struct z_owned_publisher_t *thi
  */
 ZENOHC_API void z_internal_publisher_null(struct z_owned_publisher_t *this_);
 /**
- * Returns ``true`` if querier is valid, ``false`` otherwise.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Returns ``true`` if querier is valid, ``false`` otherwise.
  */
-ZENOHC_API bool z_internal_querier_check(const struct z_owned_querier_t *this_);
+#if defined(Z_FEATURE_UNSTABLE_API)
+ZENOHC_API
+bool z_internal_querier_check(const z_owned_querier_t *this_);
+#endif
 /**
- * Constructs a querier in a gravestone state.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Constructs a querier in a gravestone state.
  */
-ZENOHC_API void z_internal_querier_null(struct z_owned_querier_t *this_);
+#if defined(Z_FEATURE_UNSTABLE_API)
+ZENOHC_API
+void z_internal_querier_null(z_owned_querier_t *this_);
+#endif
 /**
  * Returns `false` if `this` is in a gravestone state, `true` otherwise.
  */
@@ -3554,12 +3568,17 @@ z_result_t z_put(const struct z_loaned_session_t *session,
  */
 ZENOHC_API void z_put_options_default(struct z_put_options_t *this_);
 /**
- * Frees memory and resets querier to its gravestone state.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Frees memory and resets querier to its gravestone state.
  * This is equivalent to calling `z_undeclare_querier()` and discarding its return value.
  */
-ZENOHC_API void z_querier_drop(struct z_moved_querier_t *this_);
+#if defined(Z_FEATURE_UNSTABLE_API)
+ZENOHC_API
+void z_querier_drop(z_moved_querier_t *this_);
+#endif
 /**
- * Query data from the matching queryables in the system.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Query data from the matching queryables in the system.
  * Replies are provided through a callback function.
  *
  * @param querier: The querier to make query from.
@@ -3569,40 +3588,61 @@ ZENOHC_API void z_querier_drop(struct z_moved_querier_t *this_);
  *
  * @return 0 in case of success, a negative error value upon failure.
  */
+#if defined(Z_FEATURE_UNSTABLE_API)
 ZENOHC_API
-z_result_t z_querier_get(const struct z_loaned_querier_t *querier,
+z_result_t z_querier_get(const z_loaned_querier_t *querier,
                          const char *parameters,
                          struct z_moved_closure_reply_t *callback,
                          struct z_querier_get_options_t *options);
+#endif
 /**
- * Constructs the default value for `z_querier_get_options_t`.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Constructs the default value for `z_querier_get_options_t`.
  */
-ZENOHC_API void z_querier_get_options_default(struct z_querier_get_options_t *this_);
+#if defined(Z_FEATURE_UNSTABLE_API)
+ZENOHC_API
+void z_querier_get_options_default(struct z_querier_get_options_t *this_);
+#endif
 /**
  * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
  * @brief Returns the ID of the querier.
  */
-#if defined(Z_FEATURE_UNSTABLE_API)
+#if (defined(Z_FEATURE_UNSTABLE_API) && defined(Z_FEATURE_UNSTABLE_API))
 ZENOHC_API
-z_entity_global_id_t z_querier_id(const struct z_loaned_querier_t *querier);
+z_entity_global_id_t z_querier_id(const z_loaned_querier_t *querier);
 #endif
 /**
- * Returns the key expression of the querier.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Returns the key expression of the querier.
  */
+#if defined(Z_FEATURE_UNSTABLE_API)
 ZENOHC_API
-const struct z_loaned_keyexpr_t *z_querier_keyexpr(const struct z_loaned_querier_t *querier);
+const struct z_loaned_keyexpr_t *z_querier_keyexpr(const z_loaned_querier_t *querier);
+#endif
 /**
- * Borrows querier.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Borrows querier.
  */
-ZENOHC_API const struct z_loaned_querier_t *z_querier_loan(const struct z_owned_querier_t *this_);
+#if defined(Z_FEATURE_UNSTABLE_API)
+ZENOHC_API
+const z_loaned_querier_t *z_querier_loan(const z_owned_querier_t *this_);
+#endif
 /**
- * Mutably borrows querier.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Mutably borrows querier.
  */
-ZENOHC_API struct z_loaned_querier_t *z_querier_loan_mut(struct z_owned_querier_t *this_);
+#if defined(Z_FEATURE_UNSTABLE_API)
+ZENOHC_API
+z_loaned_querier_t *z_querier_loan_mut(z_owned_querier_t *this_);
+#endif
 /**
- * Constructs the default value for `z_querier_options_t`.
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+ * @brief Constructs the default value for `z_querier_options_t`.
  */
-ZENOHC_API void z_querier_options_default(struct z_querier_options_t *this_);
+#if defined(Z_FEATURE_UNSTABLE_API)
+ZENOHC_API
+void z_querier_options_default(struct z_querier_options_t *this_);
+#endif
 /**
  * Gets query attachment.
  *
@@ -4738,11 +4778,15 @@ z_result_t z_undeclare_keyexpr(const struct z_loaned_session_t *session,
  */
 ZENOHC_API z_result_t z_undeclare_publisher(struct z_moved_publisher_t *this_);
 /**
+ * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
  * @brief Undeclares the given querier.
  *
  * @return 0 in case of success, negative error code otherwise.
  */
-ZENOHC_API z_result_t z_undeclare_querier(struct z_moved_querier_t *this_);
+#if defined(Z_FEATURE_UNSTABLE_API)
+ZENOHC_API
+z_result_t z_undeclare_querier(z_moved_querier_t *this_);
+#endif
 /**
  * Undeclares a `z_owned_queryable_t`.
  * Returns 0 in case of success, negative error code otherwise.
@@ -5234,9 +5278,9 @@ z_result_t zc_publisher_get_matching_status(const struct z_loaned_publisher_t *t
  *
  * @return 0 in case of success, negative error code otherwise.
  */
-#if defined(Z_FEATURE_UNSTABLE_API)
+#if (defined(Z_FEATURE_UNSTABLE_API) && defined(Z_FEATURE_UNSTABLE_API))
 ZENOHC_API
-z_result_t zc_querier_declare_background_matching_listener(const struct z_loaned_querier_t *querier,
+z_result_t zc_querier_declare_background_matching_listener(const z_loaned_querier_t *querier,
                                                            struct zc_moved_closure_matching_status_t *callback);
 #endif
 /**
@@ -5249,9 +5293,9 @@ z_result_t zc_querier_declare_background_matching_listener(const struct z_loaned
  *
  * @return 0 in case of success, negative error code otherwise.
  */
-#if defined(Z_FEATURE_UNSTABLE_API)
+#if (defined(Z_FEATURE_UNSTABLE_API) && defined(Z_FEATURE_UNSTABLE_API))
 ZENOHC_API
-z_result_t zc_querier_declare_matching_listener(const struct z_loaned_querier_t *querier,
+z_result_t zc_querier_declare_matching_listener(const z_loaned_querier_t *querier,
                                                 zc_owned_matching_listener_t *matching_listener,
                                                 struct zc_moved_closure_matching_status_t *callback);
 #endif
@@ -5261,9 +5305,9 @@ z_result_t zc_querier_declare_matching_listener(const struct z_loaned_querier_t
  *
  * @return 0 in case of success, negative error code otherwise (in this case matching_status is not updated).
  */
-#if defined(Z_FEATURE_UNSTABLE_API)
+#if (defined(Z_FEATURE_UNSTABLE_API) && defined(Z_FEATURE_UNSTABLE_API))
 ZENOHC_API
-z_result_t zc_querier_get_matching_status(const struct z_loaned_querier_t *this_,
+z_result_t zc_querier_get_matching_status(const z_loaned_querier_t *this_,
                                           struct zc_matching_status_t *matching_status);
 #endif
 /**
diff --git a/include/zenoh_macros.h b/include/zenoh_macros.h
index 9dda86b8b..e03ca9db1 100644
--- a/include/zenoh_macros.h
+++ b/include/zenoh_macros.h
@@ -21,7 +21,6 @@ static inline z_moved_hello_t* z_hello_move(z_owned_hello_t* x) { return (z_move
 static inline z_moved_keyexpr_t* z_keyexpr_move(z_owned_keyexpr_t* x) { return (z_moved_keyexpr_t*)(x); }
 static inline z_moved_mutex_t* z_mutex_move(z_owned_mutex_t* x) { return (z_moved_mutex_t*)(x); }
 static inline z_moved_publisher_t* z_publisher_move(z_owned_publisher_t* x) { return (z_moved_publisher_t*)(x); }
-static inline z_moved_querier_t* z_querier_move(z_owned_querier_t* x) { return (z_moved_querier_t*)(x); }
 static inline z_moved_query_t* z_query_move(z_owned_query_t* x) { return (z_moved_query_t*)(x); }
 static inline z_moved_queryable_t* z_queryable_move(z_owned_queryable_t* x) { return (z_moved_queryable_t*)(x); }
 static inline z_moved_reply_t* z_reply_move(z_owned_reply_t* x) { return (z_moved_reply_t*)(x); }
@@ -58,7 +57,6 @@ static inline ze_moved_serializer_t* ze_serializer_move(ze_owned_serializer_t* x
         z_owned_hello_t : z_hello_loan, \
         z_owned_keyexpr_t : z_keyexpr_loan, \
         z_owned_publisher_t : z_publisher_loan, \
-        z_owned_querier_t : z_querier_loan, \
         z_owned_query_t : z_query_loan, \
         z_owned_queryable_t : z_queryable_loan, \
         z_owned_reply_err_t : z_reply_err_loan, \
@@ -92,7 +90,6 @@ static inline ze_moved_serializer_t* ze_serializer_move(ze_owned_serializer_t* x
         z_owned_encoding_t : z_encoding_loan_mut, \
         z_owned_mutex_t : z_mutex_loan_mut, \
         z_owned_publisher_t : z_publisher_loan_mut, \
-        z_owned_querier_t : z_querier_loan_mut, \
         z_owned_session_t : z_session_loan_mut, \
         z_owned_string_array_t : z_string_array_loan_mut, \
         ze_owned_serializer_t : ze_serializer_loan_mut \
@@ -117,7 +114,6 @@ static inline ze_moved_serializer_t* ze_serializer_move(ze_owned_serializer_t* x
         z_moved_keyexpr_t* : z_keyexpr_drop, \
         z_moved_mutex_t* : z_mutex_drop, \
         z_moved_publisher_t* : z_publisher_drop, \
-        z_moved_querier_t* : z_querier_drop, \
         z_moved_query_t* : z_query_drop, \
         z_moved_queryable_t* : z_queryable_drop, \
         z_moved_reply_t* : z_reply_drop, \
@@ -155,7 +151,6 @@ static inline ze_moved_serializer_t* ze_serializer_move(ze_owned_serializer_t* x
         z_owned_keyexpr_t : z_keyexpr_move, \
         z_owned_mutex_t : z_mutex_move, \
         z_owned_publisher_t : z_publisher_move, \
-        z_owned_querier_t : z_querier_move, \
         z_owned_query_t : z_query_move, \
         z_owned_queryable_t : z_queryable_move, \
         z_owned_reply_t : z_reply_move, \
@@ -193,7 +188,6 @@ static inline ze_moved_serializer_t* ze_serializer_move(ze_owned_serializer_t* x
         z_owned_keyexpr_t* : z_internal_keyexpr_null, \
         z_owned_mutex_t* : z_internal_mutex_null, \
         z_owned_publisher_t* : z_internal_publisher_null, \
-        z_owned_querier_t* : z_internal_querier_null, \
         z_owned_query_t* : z_internal_query_null, \
         z_owned_queryable_t* : z_internal_queryable_null, \
         z_owned_reply_err_t* : z_internal_reply_err_null, \
@@ -229,7 +223,6 @@ static inline void z_hello_take(z_owned_hello_t* this_, z_moved_hello_t* x) { *t
 static inline void z_keyexpr_take(z_owned_keyexpr_t* this_, z_moved_keyexpr_t* x) { *this_ = x->_this; z_internal_keyexpr_null(&x->_this); }
 static inline void z_mutex_take(z_owned_mutex_t* this_, z_moved_mutex_t* x) { *this_ = x->_this; z_internal_mutex_null(&x->_this); }
 static inline void z_publisher_take(z_owned_publisher_t* this_, z_moved_publisher_t* x) { *this_ = x->_this; z_internal_publisher_null(&x->_this); }
-static inline void z_querier_take(z_owned_querier_t* this_, z_moved_querier_t* x) { *this_ = x->_this; z_internal_querier_null(&x->_this); }
 static inline void z_query_take(z_owned_query_t* this_, z_moved_query_t* x) { *this_ = x->_this; z_internal_query_null(&x->_this); }
 static inline void z_queryable_take(z_owned_queryable_t* this_, z_moved_queryable_t* x) { *this_ = x->_this; z_internal_queryable_null(&x->_this); }
 static inline void z_reply_take(z_owned_reply_t* this_, z_moved_reply_t* x) { *this_ = x->_this; z_internal_reply_null(&x->_this); }
@@ -267,7 +260,6 @@ static inline void ze_serializer_take(ze_owned_serializer_t* this_, ze_moved_ser
         z_owned_keyexpr_t* : z_keyexpr_take, \
         z_owned_mutex_t* : z_mutex_take, \
         z_owned_publisher_t* : z_publisher_take, \
-        z_owned_querier_t* : z_querier_take, \
         z_owned_query_t* : z_query_take, \
         z_owned_queryable_t* : z_queryable_take, \
         z_owned_reply_t* : z_reply_take, \
@@ -305,7 +297,6 @@ static inline void ze_serializer_take(ze_owned_serializer_t* this_, ze_moved_ser
         z_owned_keyexpr_t : z_internal_keyexpr_check, \
         z_owned_mutex_t : z_internal_mutex_check, \
         z_owned_publisher_t : z_internal_publisher_check, \
-        z_owned_querier_t : z_internal_querier_check, \
         z_owned_query_t : z_internal_query_check, \
         z_owned_queryable_t : z_internal_queryable_check, \
         z_owned_reply_t : z_internal_reply_check, \
@@ -406,7 +397,6 @@ static inline z_moved_hello_t* z_hello_move(z_owned_hello_t* x) { return reinter
 static inline z_moved_keyexpr_t* z_keyexpr_move(z_owned_keyexpr_t* x) { return reinterpret_cast<z_moved_keyexpr_t*>(x); }
 static inline z_moved_mutex_t* z_mutex_move(z_owned_mutex_t* x) { return reinterpret_cast<z_moved_mutex_t*>(x); }
 static inline z_moved_publisher_t* z_publisher_move(z_owned_publisher_t* x) { return reinterpret_cast<z_moved_publisher_t*>(x); }
-static inline z_moved_querier_t* z_querier_move(z_owned_querier_t* x) { return reinterpret_cast<z_moved_querier_t*>(x); }
 static inline z_moved_query_t* z_query_move(z_owned_query_t* x) { return reinterpret_cast<z_moved_query_t*>(x); }
 static inline z_moved_queryable_t* z_queryable_move(z_owned_queryable_t* x) { return reinterpret_cast<z_moved_queryable_t*>(x); }
 static inline z_moved_reply_t* z_reply_move(z_owned_reply_t* x) { return reinterpret_cast<z_moved_reply_t*>(x); }
@@ -442,7 +432,6 @@ inline const z_loaned_fifo_handler_sample_t* z_loan(const z_owned_fifo_handler_s
 inline const z_loaned_hello_t* z_loan(const z_owned_hello_t& this_) { return z_hello_loan(&this_); };
 inline const z_loaned_keyexpr_t* z_loan(const z_owned_keyexpr_t& this_) { return z_keyexpr_loan(&this_); };
 inline const z_loaned_publisher_t* z_loan(const z_owned_publisher_t& this_) { return z_publisher_loan(&this_); };
-inline const z_loaned_querier_t* z_loan(const z_owned_querier_t& this_) { return z_querier_loan(&this_); };
 inline const z_loaned_query_t* z_loan(const z_owned_query_t& this_) { return z_query_loan(&this_); };
 inline const z_loaned_queryable_t* z_loan(const z_owned_queryable_t& this_) { return z_queryable_loan(&this_); };
 inline const z_loaned_reply_err_t* z_loan(const z_owned_reply_err_t& this_) { return z_reply_err_loan(&this_); };
@@ -474,7 +463,6 @@ inline z_loaned_config_t* z_loan_mut(z_owned_config_t& this_) { return z_config_
 inline z_loaned_encoding_t* z_loan_mut(z_owned_encoding_t& this_) { return z_encoding_loan_mut(&this_); };
 inline z_loaned_mutex_t* z_loan_mut(z_owned_mutex_t& this_) { return z_mutex_loan_mut(&this_); };
 inline z_loaned_publisher_t* z_loan_mut(z_owned_publisher_t& this_) { return z_publisher_loan_mut(&this_); };
-inline z_loaned_querier_t* z_loan_mut(z_owned_querier_t& this_) { return z_querier_loan_mut(&this_); };
 inline z_loaned_session_t* z_loan_mut(z_owned_session_t& this_) { return z_session_loan_mut(&this_); };
 inline z_loaned_string_array_t* z_loan_mut(z_owned_string_array_t& this_) { return z_string_array_loan_mut(&this_); };
 inline ze_loaned_serializer_t* z_loan_mut(ze_owned_serializer_t& this_) { return ze_serializer_loan_mut(&this_); };
@@ -497,7 +485,6 @@ inline void z_drop(z_moved_hello_t* this_) { z_hello_drop(this_); };
 inline void z_drop(z_moved_keyexpr_t* this_) { z_keyexpr_drop(this_); };
 inline void z_drop(z_moved_mutex_t* this_) { z_mutex_drop(this_); };
 inline void z_drop(z_moved_publisher_t* this_) { z_publisher_drop(this_); };
-inline void z_drop(z_moved_querier_t* this_) { z_querier_drop(this_); };
 inline void z_drop(z_moved_query_t* this_) { z_query_drop(this_); };
 inline void z_drop(z_moved_queryable_t* this_) { z_queryable_drop(this_); };
 inline void z_drop(z_moved_reply_t* this_) { z_reply_drop(this_); };
@@ -533,7 +520,6 @@ inline z_moved_hello_t* z_move(z_owned_hello_t& this_) { return z_hello_move(&th
 inline z_moved_keyexpr_t* z_move(z_owned_keyexpr_t& this_) { return z_keyexpr_move(&this_); };
 inline z_moved_mutex_t* z_move(z_owned_mutex_t& this_) { return z_mutex_move(&this_); };
 inline z_moved_publisher_t* z_move(z_owned_publisher_t& this_) { return z_publisher_move(&this_); };
-inline z_moved_querier_t* z_move(z_owned_querier_t& this_) { return z_querier_move(&this_); };
 inline z_moved_query_t* z_move(z_owned_query_t& this_) { return z_query_move(&this_); };
 inline z_moved_queryable_t* z_move(z_owned_queryable_t& this_) { return z_queryable_move(&this_); };
 inline z_moved_reply_t* z_move(z_owned_reply_t& this_) { return z_reply_move(&this_); };
@@ -569,7 +555,6 @@ inline void z_internal_null(z_owned_hello_t* this_) { z_internal_hello_null(this
 inline void z_internal_null(z_owned_keyexpr_t* this_) { z_internal_keyexpr_null(this_); };
 inline void z_internal_null(z_owned_mutex_t* this_) { z_internal_mutex_null(this_); };
 inline void z_internal_null(z_owned_publisher_t* this_) { z_internal_publisher_null(this_); };
-inline void z_internal_null(z_owned_querier_t* this_) { z_internal_querier_null(this_); };
 inline void z_internal_null(z_owned_query_t* this_) { z_internal_query_null(this_); };
 inline void z_internal_null(z_owned_queryable_t* this_) { z_internal_queryable_null(this_); };
 inline void z_internal_null(z_owned_reply_err_t* this_) { z_internal_reply_err_null(this_); };
@@ -604,7 +589,6 @@ static inline void z_hello_take(z_owned_hello_t* this_, z_moved_hello_t* x) { *t
 static inline void z_keyexpr_take(z_owned_keyexpr_t* this_, z_moved_keyexpr_t* x) { *this_ = x->_this; z_internal_keyexpr_null(&x->_this); }
 static inline void z_mutex_take(z_owned_mutex_t* this_, z_moved_mutex_t* x) { *this_ = x->_this; z_internal_mutex_null(&x->_this); }
 static inline void z_publisher_take(z_owned_publisher_t* this_, z_moved_publisher_t* x) { *this_ = x->_this; z_internal_publisher_null(&x->_this); }
-static inline void z_querier_take(z_owned_querier_t* this_, z_moved_querier_t* x) { *this_ = x->_this; z_internal_querier_null(&x->_this); }
 static inline void z_query_take(z_owned_query_t* this_, z_moved_query_t* x) { *this_ = x->_this; z_internal_query_null(&x->_this); }
 static inline void z_queryable_take(z_owned_queryable_t* this_, z_moved_queryable_t* x) { *this_ = x->_this; z_internal_queryable_null(&x->_this); }
 static inline void z_reply_take(z_owned_reply_t* this_, z_moved_reply_t* x) { *this_ = x->_this; z_internal_reply_null(&x->_this); }
@@ -675,9 +659,6 @@ inline void z_take(z_owned_mutex_t* this_, z_moved_mutex_t* x) {
 inline void z_take(z_owned_publisher_t* this_, z_moved_publisher_t* x) {
     z_publisher_take(this_, x);
 };
-inline void z_take(z_owned_querier_t* this_, z_moved_querier_t* x) {
-    z_querier_take(this_, x);
-};
 inline void z_take(z_owned_query_t* this_, z_moved_query_t* x) {
     z_query_take(this_, x);
 };
@@ -745,7 +726,6 @@ inline bool z_internal_check(const z_owned_hello_t& this_) { return z_internal_h
 inline bool z_internal_check(const z_owned_keyexpr_t& this_) { return z_internal_keyexpr_check(&this_); };
 inline bool z_internal_check(const z_owned_mutex_t& this_) { return z_internal_mutex_check(&this_); };
 inline bool z_internal_check(const z_owned_publisher_t& this_) { return z_internal_publisher_check(&this_); };
-inline bool z_internal_check(const z_owned_querier_t& this_) { return z_internal_querier_check(&this_); };
 inline bool z_internal_check(const z_owned_query_t& query) { return z_internal_query_check(&query); };
 inline bool z_internal_check(const z_owned_queryable_t& this_) { return z_internal_queryable_check(&this_); };
 inline bool z_internal_check(const z_owned_reply_t& this_) { return z_internal_reply_check(&this_); };
@@ -925,8 +905,6 @@ template<> struct z_loaned_to_owned_type_t<z_loaned_keyexpr_t> { typedef z_owned
 template<> struct z_owned_to_loaned_type_t<z_owned_keyexpr_t> { typedef z_loaned_keyexpr_t type; };
 template<> struct z_loaned_to_owned_type_t<z_loaned_publisher_t> { typedef z_owned_publisher_t type; };
 template<> struct z_owned_to_loaned_type_t<z_owned_publisher_t> { typedef z_loaned_publisher_t type; };
-template<> struct z_loaned_to_owned_type_t<z_loaned_querier_t> { typedef z_owned_querier_t type; };
-template<> struct z_owned_to_loaned_type_t<z_owned_querier_t> { typedef z_loaned_querier_t type; };
 template<> struct z_loaned_to_owned_type_t<z_loaned_query_t> { typedef z_owned_query_t type; };
 template<> struct z_owned_to_loaned_type_t<z_owned_query_t> { typedef z_loaned_query_t type; };
 template<> struct z_loaned_to_owned_type_t<z_loaned_queryable_t> { typedef z_owned_queryable_t type; };
diff --git a/splitguide.yaml b/splitguide.yaml
index eda6949f8..55783677a 100644
--- a/splitguide.yaml
+++ b/splitguide.yaml
@@ -35,8 +35,8 @@ zenoh_opaque.h:
   - z_loaned_query_t!
   - z_owned_queryable_t!
   - z_loaned_queryable_t!
-  - z_owned_querier_t!
-  - z_loaned_querier_t!
+  - z_owned_querier_t!#unstable
+  - z_loaned_querier_t!#unstable
   - ze_owned_querying_subscriber_t!#unstable
   - ze_loaned_querying_subscriber_t!#unstable
   - z_owned_keyexpr_t!
diff --git a/src/lib.rs b/src/lib.rs
index 5edb0cc92..17740aa4a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -41,7 +41,9 @@ mod info;
 pub use crate::info::*;
 mod get;
 pub use crate::get::*;
+#[cfg(feature = "unstable")]
 mod querier;
+#[cfg(feature = "unstable")]
 pub use crate::querier::*;
 mod queryable;
 pub use crate::queryable::*;
diff --git a/src/querier.rs b/src/querier.rs
index df4c0a287..785721566 100644
--- a/src/querier.rs
+++ b/src/querier.rs
@@ -40,7 +40,8 @@ use crate::{
     zc_owned_matching_listener_t, zc_reply_keyexpr_default, zc_reply_keyexpr_t,
 };
 
-/// Options passed to the `z_declare_querier()` function.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Options passed to the `z_declare_querier()` function.
 #[repr(C)]
 pub struct z_querier_options_t {
     /// The Queryables that should be target of the querier queries.
@@ -67,7 +68,8 @@ pub struct z_querier_options_t {
     pub timeout_ms: u64,
 }
 
-/// Constructs the default value for `z_querier_options_t`.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Constructs the default value for `z_querier_options_t`.
 #[no_mangle]
 pub extern "C" fn z_querier_options_default(this_: &mut MaybeUninit<z_querier_options_t>) {
     this_.write(z_querier_options_t {
@@ -89,7 +91,8 @@ decl_c_type!(
     loaned(z_loaned_querier_t),
 );
 
-/// Constructs and declares a querier on the given key expression.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Constructs and declares a querier on the given key expression.
 ///
 /// The queries can be send with the help of the `z_querier_get()` function.
 ///
@@ -141,21 +144,24 @@ pub extern "C" fn z_declare_querier(
     }
 }
 
-/// Constructs a querier in a gravestone state.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Constructs a querier in a gravestone state.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
 pub extern "C" fn z_internal_querier_null(this_: &mut MaybeUninit<z_owned_querier_t>) {
     this_.as_rust_type_mut_uninit().write(None);
 }
 
-/// Returns ``true`` if querier is valid, ``false`` otherwise.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Returns ``true`` if querier is valid, ``false`` otherwise.
 #[allow(clippy::missing_safety_doc)]
 #[no_mangle]
 pub extern "C" fn z_internal_querier_check(this_: &z_owned_querier_t) -> bool {
     this_.as_rust_type_ref().is_some()
 }
 
-/// Borrows querier.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Borrows querier.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
 pub unsafe extern "C" fn z_querier_loan(this_: &z_owned_querier_t) -> &z_loaned_querier_t {
@@ -166,7 +172,8 @@ pub unsafe extern "C" fn z_querier_loan(this_: &z_owned_querier_t) -> &z_loaned_
         .as_loaned_c_type_ref()
 }
 
-/// Mutably borrows querier.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Mutably borrows querier.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
 pub unsafe extern "C" fn z_querier_loan_mut(
@@ -178,7 +185,8 @@ pub unsafe extern "C" fn z_querier_loan_mut(
         .as_loaned_c_type_mut()
 }
 
-/// Options passed to the `z_querier_get()` function.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Options passed to the `z_querier_get()` function.
 #[repr(C)]
 pub struct z_querier_get_options_t {
     /// An optional payload to attach to the query.
@@ -194,7 +202,8 @@ pub struct z_querier_get_options_t {
     pub attachment: Option<&'static mut z_moved_bytes_t>,
 }
 
-/// Constructs the default value for `z_querier_get_options_t`.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Constructs the default value for `z_querier_get_options_t`.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
 pub extern "C" fn z_querier_get_options_default(this: &mut MaybeUninit<z_querier_get_options_t>) {
@@ -207,7 +216,8 @@ pub extern "C" fn z_querier_get_options_default(this: &mut MaybeUninit<z_querier
     });
 }
 
-/// Query data from the matching queryables in the system.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Query data from the matching queryables in the system.
 /// Replies are provided through a callback function.
 ///
 /// @param querier: The querier to make query from.
@@ -275,7 +285,8 @@ pub extern "C" fn z_querier_id(querier: &z_loaned_querier_t) -> z_entity_global_
     querier.as_rust_type_ref().id().into_c_type()
 }
 
-/// Returns the key expression of the querier.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Returns the key expression of the querier.
 #[no_mangle]
 pub extern "C" fn z_querier_keyexpr(querier: &z_loaned_querier_t) -> &z_loaned_keyexpr_t {
     querier.as_rust_type_ref().key_expr().as_loaned_c_type_ref()
@@ -377,8 +388,8 @@ pub extern "C" fn zc_querier_get_matching_status(
         }
     }
 }
-
-/// Frees memory and resets querier to its gravestone state.
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
+/// @brief Frees memory and resets querier to its gravestone state.
 /// This is equivalent to calling `z_undeclare_querier()` and discarding its return value.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
@@ -386,10 +397,11 @@ pub extern "C" fn z_querier_drop(this: &mut z_moved_querier_t) {
     std::mem::drop(this.take_rust_type())
 }
 
-#[no_mangle]
+/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
 /// @brief Undeclares the given querier.
 ///
 /// @return 0 in case of success, negative error code otherwise.
+#[no_mangle]
 pub extern "C" fn z_undeclare_querier(this_: &mut z_moved_querier_t) -> result::z_result_t {
     if let Some(q) = this_.take_rust_type() {
         if let Err(e) = q.undeclare().wait() {