diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
index a8e18629..dfd1c46b 100644
--- a/.github/release-please/manifest.json
+++ b/.github/release-please/manifest.json
@@ -1,19 +1,23 @@
 {
-  "air": "0.37.0",
-  "air-interpreter": "0.37.0",
+  "air": "0.37.1",
+  "air-interpreter": "0.37.1",
   "avm/interface": "0.28.2",
   "avm/server": "0.30.1",
-  "avm/client": "0.37.0",
-  "crates/air-lib/air-parser": "0.7.3",
-  "crates/air-lib/execution-info-collector": "0.7.2",
+  "avm/client": "0.37.1",
+  "crates/air-lib/air-parser": "0.7.4",
+  "crates/air-lib/execution-info-collector": "0.7.3",
   "crates/air-lib/interpreter-cid": "0.2.0",
-  "crates/air-lib/interpreter-data": "0.6.2",
-  "crates/air-lib/test-utils": "0.4.5",
-  "crates/air-lib/trace-handler": "0.1.1",
+  "crates/air-lib/interpreter-data": "0.6.3",
+  "crates/air-lib/test-utils": "0.4.6",
+  "crates/air-lib/trace-handler": "0.1.2",
   "crates/air-lib/utils": "0.1.0",
-  "crates/beautifier": "0.1.1",
+  "crates/beautifier": "0.1.2",
   "crates/data-store": "0.6.0",
-  "crates/testing-framework": "0.1.5",
+  "crates/testing-framework": "0.1.6",
   "tools/cli/aquavm-air-cli": "0.2.6",
-  "tools/wasm/air-beautify-wasm": "0.1.0"
+  "tools/wasm/air-beautify-wasm": "0.1.2",
+  "tools/cli/air": "0.2.7",
+  "crates/air-lib/lambda/ast": "0.1.0",
+  "crates/air-lib/lambda/parser": "0.1.0",
+  "crates/air-lib/log-targets": "0.1.0"
 }
diff --git a/Cargo.lock b/Cargo.lock
index 4f7349d0..a4099d67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,7 +22,7 @@ dependencies = [
 
 [[package]]
 name = "air-beautify-wasm"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "air-beautifier",
  "wasm-bindgen",
@@ -37,7 +37,7 @@ dependencies = [
 
 [[package]]
 name = "air-interpreter"
-version = "0.37.0"
+version = "0.37.1"
 dependencies = [
  "air-interpreter-interface",
  "air-log-targets",
@@ -120,7 +120,7 @@ version = "0.1.0"
 
 [[package]]
 name = "air-test-utils"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "air-interpreter-cid",
  "air-interpreter-data",
@@ -140,7 +140,7 @@ dependencies = [
 
 [[package]]
 name = "air-testing-framework"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "air-test-utils",
  "aquavm-air-parser",
@@ -206,7 +206,7 @@ checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
 
 [[package]]
 name = "aquavm-air"
-version = "0.37.0"
+version = "0.37.1"
 dependencies = [
  "air-execution-info-collector",
  "air-interpreter-cid",
@@ -245,7 +245,7 @@ dependencies = [
 
 [[package]]
 name = "aquavm-air-cli"
-version = "0.2.6"
+version = "0.2.7"
 dependencies = [
  "air-beautifier",
  "air-interpreter-interface",
@@ -263,7 +263,7 @@ dependencies = [
 
 [[package]]
 name = "aquavm-air-parser"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "air-lambda-ast",
  "air-lambda-parser",
diff --git a/air-interpreter/CHANGELOG.md b/air-interpreter/CHANGELOG.md
index e14584a1..806aedc4 100644
--- a/air-interpreter/CHANGELOG.md
+++ b/air-interpreter/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.37.1](https://github.com/fluencelabs/aquavm/compare/air-interpreter-v0.37.0...air-interpreter-v0.37.1) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * aquavm-air bumped from 0.37.0 to 0.37.1
+
 ## [0.37.0](https://github.com/fluencelabs/aquavm/compare/air-interpreter-v0.35.5...air-interpreter-v0.37.0) (2023-03-13)
 
 
diff --git a/air-interpreter/Cargo.toml b/air-interpreter/Cargo.toml
index 0762d6e4..3d522c57 100644
--- a/air-interpreter/Cargo.toml
+++ b/air-interpreter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "air-interpreter"
-version = "0.37.0"
+version = "0.37.1"
 description = "Crate-wrapper for air"
 authors = ["Fluence Labs"]
 edition = "2018"
@@ -18,7 +18,7 @@ name = "air_interpreter_server"
 path = "src/marine.rs"
 
 [dependencies]
-aquavm-air = { version = "0.37.0", path = "../air" }
+aquavm-air = { version = "0.37.1", path = "../air" }
 air-interpreter-interface = { version = "0.12.1", path = "../crates/air-lib/interpreter-interface" }
 air-log-targets = { version = "0.1.0", path = "../crates/air-lib/log-targets" }
 
diff --git a/air/CHANGELOG.md b/air/CHANGELOG.md
index a9032be3..88e05d2a 100644
--- a/air/CHANGELOG.md
+++ b/air/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.37.1](https://github.com/fluencelabs/aquavm/compare/air-v0.37.0...air-v0.37.1) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * aquavm-air-parser bumped from 0.7.3 to 0.7.4
+    * air-execution-info-collector bumped from 0.7.2 to 0.7.3
+    * air-interpreter-data bumped from 0.6.2 to 0.6.3
+
 ## [0.37.0](https://github.com/fluencelabs/aquavm/compare/air-v0.36.0...air-v0.37.0) (2023-03-13)
 
 
diff --git a/air/Cargo.toml b/air/Cargo.toml
index f8d34047..78f42e64 100644
--- a/air/Cargo.toml
+++ b/air/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aquavm-air"
-version = "0.37.0"
+version = "0.37.1"
 description = "Interpreter of AIR scripts intended to coordinate request flow in the Fluence network"
 authors = ["Fluence Labs"]
 edition = "2018"
@@ -15,10 +15,10 @@ path = "src/lib.rs"
 doctest = false
 
 [dependencies]
-aquavm-air-parser = { version = "0.7.3", path = "../crates/air-lib/air-parser" }
-air-execution-info-collector = { version = "0.7.2", path = "../crates/air-lib/execution-info-collector" }
+aquavm-air-parser = { version = "0.7.4", path = "../crates/air-lib/air-parser" }
+air-execution-info-collector = { version = "0.7.3", path = "../crates/air-lib/execution-info-collector" }
 air-interpreter-cid = { version = "0.2.0", path = "../crates/air-lib/interpreter-cid" }
-air-interpreter-data = { version = "0.6.2", path = "../crates/air-lib/interpreter-data" }
+air-interpreter-data = { version = "0.6.3", path = "../crates/air-lib/interpreter-data" }
 air-interpreter-interface = { version = "0.12.1", path = "../crates/air-lib/interpreter-interface", default-features = false }
 air-log-targets = { version = "0.1.0", path = "../crates/air-lib/log-targets" }
 air-lambda-ast = { version = "0.1.0", path = "../crates/air-lib/lambda/ast" }
diff --git a/avm/client/CHANGELOG.md b/avm/client/CHANGELOG.md
index 38907eb4..cdaaefdc 100644
--- a/avm/client/CHANGELOG.md
+++ b/avm/client/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.37.1](https://github.com/fluencelabs/aquavm/compare/avm-client-v0.37.0...avm-client-v0.37.1) (2023-03-15)
+
+
+### Miscellaneous Chores
+
+* **avm-client:** Synchronize air-interpreter versions
+
 ## [0.37.0](https://github.com/fluencelabs/aquavm/compare/avm-client-v0.35.4...avm-client-v0.37.0) (2023-03-13)
 
 
diff --git a/avm/client/package-lock.json b/avm/client/package-lock.json
index 4e349702..cc5eb557 100644
--- a/avm/client/package-lock.json
+++ b/avm/client/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@fluencelabs/avm",
-    "version": "0.37.0",
+    "version": "0.37.1",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@fluencelabs/avm",
-            "version": "0.37.0",
+            "version": "0.37.1",
             "license": "Apache 2.0",
             "devDependencies": {
                 "typescript": "4.9.5"
diff --git a/avm/client/package.json b/avm/client/package.json
index 7dc24e2c..2b0bde76 100644
--- a/avm/client/package.json
+++ b/avm/client/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@fluencelabs/avm",
     "description": "Aquamarine VM",
-    "version": "0.37.0",
+    "version": "0.37.1",
     "main": "./dist/index.js",
     "repository": "https://github.com/fluencelabs/air",
     "author": "Fluence Labs",
diff --git a/crates/air-lib/air-parser/CHANGELOG.md b/crates/air-lib/air-parser/CHANGELOG.md
index e8d9e2de..68a038ad 100644
--- a/crates/air-lib/air-parser/CHANGELOG.md
+++ b/crates/air-lib/air-parser/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.7.4](https://github.com/fluencelabs/aquavm/compare/air-parser-v0.7.3...air-parser-v0.7.4) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
 ## [0.7.3](https://github.com/fluencelabs/aquavm/compare/air-parser-v0.7.2...air-parser-v0.7.3) (2023-02-21)
 
 
diff --git a/crates/air-lib/air-parser/Cargo.toml b/crates/air-lib/air-parser/Cargo.toml
index bab381ff..fb93fb4c 100644
--- a/crates/air-lib/air-parser/Cargo.toml
+++ b/crates/air-lib/air-parser/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "aquavm-air-parser"
 description = "Parser of the AIR scripts in a form of string to AST"
-version = "0.7.3"
+version = "0.7.4"
 authors = ["Fluence Labs"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/crates/air-lib/execution-info-collector/CHANGELOG.md b/crates/air-lib/execution-info-collector/CHANGELOG.md
new file mode 100644
index 00000000..98e103ef
--- /dev/null
+++ b/crates/air-lib/execution-info-collector/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+## [0.7.3](https://github.com/fluencelabs/aquavm/compare/air-execution-info-collector-v0.7.2...air-execution-info-collector-v0.7.3) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * aquavm-air-parser bumped from 0.7.3 to 0.7.4
diff --git a/crates/air-lib/execution-info-collector/Cargo.toml b/crates/air-lib/execution-info-collector/Cargo.toml
index d5362a51..37c958f8 100644
--- a/crates/air-lib/execution-info-collector/Cargo.toml
+++ b/crates/air-lib/execution-info-collector/Cargo.toml
@@ -15,4 +15,4 @@ name = "air_execution_info_collector"
 path = "src/lib.rs"
 
 [dependencies]
-aquavm-air-parser = { version = "0.7.3", path = "../air-parser" }
+aquavm-air-parser = { version = "0.7.4", path = "../air-parser" }
diff --git a/crates/air-lib/interpreter-data/CHANGELOG.md b/crates/air-lib/interpreter-data/CHANGELOG.md
index f8005b13..f9ea4d08 100644
--- a/crates/air-lib/interpreter-data/CHANGELOG.md
+++ b/crates/air-lib/interpreter-data/CHANGELOG.md
@@ -4,6 +4,20 @@
   * dependencies
     * air-parser bumped from 0.7.2 to 0.7.3
 
+## [0.6.3](https://github.com/fluencelabs/aquavm/compare/air-interpreter-data-v0.6.2...air-interpreter-data-v0.6.3) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * aquavm-air-parser bumped from 0.7.3 to 0.7.4
+
 ## [0.6.2](https://github.com/fluencelabs/aquavm/compare/air-interpreter-data-v0.6.1...air-interpreter-data-v0.6.2) (2023-02-08)
 
 
diff --git a/crates/air-lib/interpreter-data/Cargo.toml b/crates/air-lib/interpreter-data/Cargo.toml
index 64baee46..4cd4ecba 100644
--- a/crates/air-lib/interpreter-data/Cargo.toml
+++ b/crates/air-lib/interpreter-data/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/lib.rs"
 
 [dependencies]
 air-utils = { version = "0.1.0", path = "../utils" }
-aquavm-air-parser = { version = "0.7.3", path = "../air-parser" }
+aquavm-air-parser = { version = "0.7.4", path = "../air-parser" }
 air-interpreter-interface = { version = "0.12.1", path = "../interpreter-interface" }
 air-interpreter-cid = { version = "0.2.0", path = "../interpreter-cid" }
 polyplets = { version = "0.3.2", path = "../polyplets" }
diff --git a/crates/air-lib/lambda/ast/CHANGELOG.md b/crates/air-lib/lambda/ast/CHANGELOG.md
new file mode 100644
index 00000000..d82c93a9
--- /dev/null
+++ b/crates/air-lib/lambda/ast/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Changelog
+
+## 0.1.0 (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
diff --git a/crates/air-lib/lambda/parser/CHANGELOG.md b/crates/air-lib/lambda/parser/CHANGELOG.md
new file mode 100644
index 00000000..d82c93a9
--- /dev/null
+++ b/crates/air-lib/lambda/parser/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Changelog
+
+## 0.1.0 (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
diff --git a/crates/air-lib/log-targets/CHANGELOG.md b/crates/air-lib/log-targets/CHANGELOG.md
new file mode 100644
index 00000000..d82c93a9
--- /dev/null
+++ b/crates/air-lib/log-targets/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Changelog
+
+## 0.1.0 (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
diff --git a/crates/air-lib/test-utils/CHANGELOG.md b/crates/air-lib/test-utils/CHANGELOG.md
index 21801ef8..adf1b22e 100644
--- a/crates/air-lib/test-utils/CHANGELOG.md
+++ b/crates/air-lib/test-utils/CHANGELOG.md
@@ -14,6 +14,20 @@
   * dependencies
     * avm-server bumped from 0.30.0 to 0.30.1
 
+## [0.4.6](https://github.com/fluencelabs/aquavm/compare/air-test-utils-v0.4.5...air-test-utils-v0.4.6) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * aquavm-air bumped from 0.37.0 to 0.37.1
+
 ## [0.4.2](https://github.com/fluencelabs/aquavm/compare/air-test-utils-v0.4.1...air-test-utils-v0.4.2) (2023-02-08)
 
 
diff --git a/crates/air-lib/test-utils/Cargo.toml b/crates/air-lib/test-utils/Cargo.toml
index d2984d3d..4362e670 100644
--- a/crates/air-lib/test-utils/Cargo.toml
+++ b/crates/air-lib/test-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "air-test-utils"
-version = "0.4.5"
+version = "0.4.6"
 description = "Test utils for the AIR interpreter"
 authors = ["Fluence Labs"]
 edition = "2018"
@@ -15,7 +15,7 @@ name = "air_test_utils"
 path = "src/lib.rs"
 
 [dependencies]
-aquavm-air = { version = "0.37.0", path = "../../../air" }
+aquavm-air = { version = "0.37.1", path = "../../../air" }
 air-interpreter-cid = { version = "0.2.0", path = "../interpreter-cid" }
 air-interpreter-data = { version = "0.6.3", path = "../interpreter-data" }
 air-interpreter-interface = { version = "0.12.1", path = "../interpreter-interface" }
diff --git a/crates/air-lib/trace-handler/CHANGELOG.md b/crates/air-lib/trace-handler/CHANGELOG.md
new file mode 100644
index 00000000..fd8f3abf
--- /dev/null
+++ b/crates/air-lib/trace-handler/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+## [0.1.2](https://github.com/fluencelabs/aquavm/compare/air-trace-handler-v0.1.1...air-trace-handler-v0.1.2) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * aquavm-air-parser bumped from 0.7.3 to 0.7.4
diff --git a/crates/air-lib/trace-handler/Cargo.toml b/crates/air-lib/trace-handler/Cargo.toml
index 8d66a6b9..1572b2ec 100644
--- a/crates/air-lib/trace-handler/Cargo.toml
+++ b/crates/air-lib/trace-handler/Cargo.toml
@@ -17,7 +17,7 @@ air-interpreter-cid = { version = "0.2.0", path = "../interpreter-cid" }
 air-interpreter-data = { version = "0.6.3", path = "../interpreter-data" }
 air-interpreter-interface = { version = "0.12.1", path = "../interpreter-interface" }
 air-log-targets = { version = "0.1.0", path = "../log-targets" }
-aquavm-air-parser = { version = "0.7.3", path = "../air-parser" }
+aquavm-air-parser = { version = "0.7.4", path = "../air-parser" }
 polyplets = { version = "0.3.2", path = "../polyplets" }
 
 bimap = "0.6.2"
diff --git a/crates/beautifier/CHANGELOG.md b/crates/beautifier/CHANGELOG.md
new file mode 100644
index 00000000..a61607bc
--- /dev/null
+++ b/crates/beautifier/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+## [0.1.2](https://github.com/fluencelabs/aquavm/compare/air-beautifier-v0.1.1...air-beautifier-v0.1.2) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * aquavm-air-parser bumped from 0.7.3 to 0.7.4
diff --git a/crates/beautifier/Cargo.toml b/crates/beautifier/Cargo.toml
index c777f834..4d4b6c27 100644
--- a/crates/beautifier/Cargo.toml
+++ b/crates/beautifier/Cargo.toml
@@ -14,6 +14,6 @@ name = "air_beautifier"
 path = "src/lib.rs"
 
 [dependencies]
-aquavm-air-parser = { version = "0.7.3", path = "../air-lib/air-parser" }
+aquavm-air-parser = { version = "0.7.4", path = "../air-lib/air-parser" }
 itertools = "0.10.5"
 thiserror = "1.0.39"
diff --git a/crates/interpreter-wasm/Cargo.lock b/crates/interpreter-wasm/Cargo.lock
index d5434e65..a7d42c36 100644
--- a/crates/interpreter-wasm/Cargo.lock
+++ b/crates/interpreter-wasm/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "air-interpreter-wasm"
-version = "0.37.0"
+version = "0.37.1"
 dependencies = [
  "built",
 ]
diff --git a/crates/interpreter-wasm/Cargo.toml b/crates/interpreter-wasm/Cargo.toml
index d3666f74..5fd47e86 100644
--- a/crates/interpreter-wasm/Cargo.toml
+++ b/crates/interpreter-wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "air-interpreter-wasm"
-version = "0.37.0"
+version = "0.37.1"
 description = "Distribution of AIR interpreter as .wasm"
 authors = ["Fluence Labs"]
 license = "Apache-2.0"
diff --git a/crates/testing-framework/CHANGELOG.md b/crates/testing-framework/CHANGELOG.md
new file mode 100644
index 00000000..82c11106
--- /dev/null
+++ b/crates/testing-framework/CHANGELOG.md
@@ -0,0 +1,18 @@
+# Changelog
+
+## [0.1.6](https://github.com/fluencelabs/aquavm/compare/air-testing-framework-v0.1.5...air-testing-framework-v0.1.6) (2023-03-15)
+
+
+### Features
+
+* **tools:** merge some tools into the `air` CLI tool ([#509](https://github.com/fluencelabs/aquavm/issues/509)) ([79ac153](https://github.com/fluencelabs/aquavm/commit/79ac153f1dcfc0a77ec511c6e25285728312ad4c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * air-test-utils bumped from 0.4.5 to 0.4.6
+    * aquavm-air-parser bumped from 0.7.3 to 0.7.4
+  * dev-dependencies
+    * air-test-utils bumped from 0.4.5 to 0.4.6
diff --git a/crates/testing-framework/Cargo.toml b/crates/testing-framework/Cargo.toml
index b3603276..90ac0728 100644
--- a/crates/testing-framework/Cargo.toml
+++ b/crates/testing-framework/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "air-testing-framework"
-version = "0.1.5"
+version = "0.1.6"
 description = "AquaVM testing framework"
 authors = ["Fluence Labs"]
 edition = "2018"
@@ -14,8 +14,8 @@ name = "air_test_framework"
 path = "src/lib.rs"
 
 [dependencies]
-air-test-utils = { version = "0.4.5", path = "../air-lib/test-utils" }
-aquavm-air-parser = { version = "0.7.3", path = "../air-lib/air-parser" }
+air-test-utils = { version = "0.4.6", path = "../air-lib/test-utils" }
+aquavm-air-parser = { version = "0.7.4", path = "../air-lib/air-parser" }
 
 itertools = "0.10.5"
 strum = { version="0.24.1", features=["derive"] }
@@ -28,4 +28,4 @@ maplit = "1.0.2"
 pretty_assertions = "1.3.0"
 
 # We do not want to depend on wasm binary path
-air-test-utils = { version = "0.4.5", path = "../air-lib/test-utils", features = ["test_with_native_code"] }
+air-test-utils = { version = "0.4.6", path = "../air-lib/test-utils", features = ["test_with_native_code"] }
diff --git a/tools/cli/air/CHANGELOG.md b/tools/cli/air/CHANGELOG.md
index 55b01f94..d986512c 100644
--- a/tools/cli/air/CHANGELOG.md
+++ b/tools/cli/air/CHANGELOG.md
@@ -7,6 +7,11 @@
     * avm-data-store bumped from 0.4.1 to 0.5.0
     * avm-interface bumped from 0.28.1 to 0.28.2
 
+* The following workspace dependencies were updated
+  * dependencies
+    * aquavm-air bumped from 0.37.0 to 0.37.1
+    * air-test-utils bumped from 0.4.4 to 0.4.6
+
 ## [0.2.6](https://github.com/fluencelabs/aquavm/compare/air-trace-v0.2.5...air-trace-v0.2.6) (2023-03-13)
 
 
diff --git a/tools/cli/air/Cargo.toml b/tools/cli/air/Cargo.toml
index c6350e0d..14d91f82 100644
--- a/tools/cli/air/Cargo.toml
+++ b/tools/cli/air/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aquavm-air-cli"
-version = "0.2.6"
+version = "0.2.7"
 edition = "2021"
 description = "AIR execution and printing tool"
 authors = ["Fluence Labs"]
@@ -10,12 +10,12 @@ documentation = "https://docs.rs/aquavm-air-cli"
 keywords = ["fluence", "air", "tracing"]
 
 [dependencies]
-aquavm-air = { version = "0.37.0", path = "../../../air" }
+aquavm-air = { version = "0.37.1", path = "../../../air" }
 air-beautifier = { version = "0.1.2", path = "../../../crates/beautifier" }
 avm-data-store = { version = "0.6.0", path = "../../../crates/data-store" }
 avm-interface = { version = "0.28.2", path = "../../../avm/interface" }
 air-interpreter-interface = { version = "0.12.1", path = "../../../crates/air-lib/interpreter-interface", default-features = false }
-air-test-utils = { version = "0.4.4",path = "../../../crates/air-lib/test-utils", optional = true }
+air-test-utils = { version = "0.4.6",path = "../../../crates/air-lib/test-utils", optional = true }
 
 anyhow = "1.0.69"
 clap = { version = "4.1.8", features = ["derive", "env"] }
diff --git a/tools/wasm/air-beautify-wasm/Cargo.toml b/tools/wasm/air-beautify-wasm/Cargo.toml
index 49217863..b2367a9f 100644
--- a/tools/wasm/air-beautify-wasm/Cargo.toml
+++ b/tools/wasm/air-beautify-wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "air-beautify-wasm"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Fluence Labs"]
 edition = "2021"
 description = "WASM module for air-beautify"