diff --git a/Cargo.lock b/Cargo.lock
index 4ad3f6f7e7..b331a798b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4415,6 +4415,7 @@ dependencies = [
  "zenoh-runtime",
  "zenoh-shm",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-transport",
  "zenoh-util",
 ]
@@ -4543,6 +4544,7 @@ dependencies = [
  "zenoh-result",
  "zenoh-runtime",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-util",
 ]
 
@@ -4925,6 +4927,7 @@ dependencies = [
 name = "zenoh-runtime"
 version = "0.11.0-dev"
 dependencies = [
+ "futures",
  "lazy_static",
  "tokio",
  "zenoh-collections",
@@ -4956,6 +4959,18 @@ dependencies = [
  "zenoh-runtime",
 ]
 
+[[package]]
+name = "zenoh-task"
+version = "0.11.0-dev"
+dependencies = [
+ "futures",
+ "log",
+ "tokio",
+ "tokio-util",
+ "zenoh-core",
+ "zenoh-runtime",
+]
+
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
@@ -4987,6 +5002,7 @@ dependencies = [
  "zenoh-runtime",
  "zenoh-shm",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-util",
 ]
 
diff --git a/commons/zenoh-macros/build.rs b/commons/zenoh-macros/build.rs
index 557593d00e..d5ce6632dc 100644
--- a/commons/zenoh-macros/build.rs
+++ b/commons/zenoh-macros/build.rs
@@ -23,6 +23,7 @@ fn main() {
     let version_rs = std::path::PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("version.rs");
     let mut version_rs = OpenOptions::new()
         .create(true)
+        .truncate(true)
         .write(true)
         .open(version_rs)
         .unwrap();
diff --git a/zenoh/tests/connection_retry.rs b/zenoh/tests/connection_retry.rs
index db84d7bd5d..fcb071b489 100644
--- a/zenoh/tests/connection_retry.rs
+++ b/zenoh/tests/connection_retry.rs
@@ -36,8 +36,7 @@ fn retry_config_overriding() {
         .insert_json5("listen/exit_on_failure", "false")
         .unwrap();
 
-    let expected = vec![
-        // global value
+    let expected = [
         ConnectionRetryConf {
             period_init_ms: 3000,
             period_max_ms: 6000,