diff --git a/.cargo/config.toml b/.cargo/config.toml
index ddcef03f..a3a9d7c1 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -17,8 +17,8 @@ rustflags = [
 ]
 
 [env]
-LLVM_SYS_150_PREFIX = { value = "./target-llvm/target-final/", relative = true, force = false }
-RUST_BACKTRACE = { value = "full" }
+LLVM_SYS_170_PREFIX = { value = "./target-llvm/target-final/", relative = true, force = false }
+RUST_BACKTRACE = { value = "0" }
 RUST_LOG = { value = "vm=trace" }
 
 [tools.clippy]
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 915cb711..dae4224d 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -46,9 +46,9 @@ jobs:
       - name: Define branches
         run: |
           if [ "${{ matrix.type }}" = "candidate" ]; then
-            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_candidate_branch || 'main' }}" >> $GITHUB_ENV
+            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_candidate_branch || github.head_ref }}" >> $GITHUB_ENV
           else
-            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_reference_branch || 'main' }}" >> $GITHUB_ENV
+            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_reference_branch || github.event.repository.default_branch }}" >> $GITHUB_ENV
           fi
 
       - name: Checkout compiler-tester
@@ -64,10 +64,7 @@ jobs:
           debug: ${{ github.event.inputs.llvm_build_type || 'release' }}
 
       - name: Benchmark
-        env:
-          RUST_BACKTRACE: full
         run: |
-          export LLVM_SYS_150_PREFIX="$(pwd)/target-llvm/target-final/"
           cargo build --verbose --release --bin 'compiler-tester'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-solidity-*/*/Cargo.toml --target-dir './target-zksolc/'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-vyper-*/*/Cargo.toml --target-dir './target-zkvyper/'
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 68debc1f..df715cf7 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -28,8 +28,6 @@ jobs:
 
       - name: Run tests
         run: |
-          export RUST_BACKTRACE='full'
-          export LLVM_SYS_150_PREFIX="$(pwd)/target-llvm/target-final/"
           cargo build --verbose --release --bin 'compiler-tester'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-solidity-*/*/Cargo.toml --target-dir './target-zksolc/'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-vyper-*/*/Cargo.toml --target-dir './target-zkvyper/'
diff --git a/.gitignore b/.gitignore
index 3802585b..c684360b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 /llvm/
 
 # External compilers
-/solc-bin/*
 /solc-bin*/*
 /vyper-bin/*
 
diff --git a/.gitmodules b/.gitmodules
index 85e5e7ec..eae3273c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,4 +9,4 @@
 [submodule "era-contracts"]
 	path = era-contracts
 	url = https://github.com/matter-labs/era-contracts
-	branch = az-benchmark-evm-interpreter
+	branch = main
diff --git a/Cargo.lock b/Cargo.lock
index 32f889fb..bcaf1c9a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -63,7 +63,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -197,9 +197,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.92"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
+checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
 dependencies = [
  "jobserver",
  "libc",
@@ -440,9 +440,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "elliptic-curve"
@@ -482,7 +482,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -518,7 +518,7 @@ dependencies = [
 [[package]]
 name = "era-compiler-llvm-context"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-compiler-llvm-context?branch=v1.5.0#b63448f92a3f8fff7f1ea21cbbaa31c4c817543e"
+source = "git+https://github.com/matter-labs/era-compiler-llvm-context?branch=v1.5.0#711d42971fe41966e86f0b35fcd92c53f6c677a6"
 dependencies = [
  "anyhow",
  "era-compiler-common",
@@ -540,7 +540,7 @@ dependencies = [
 [[package]]
 name = "era-compiler-solidity"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=v1.5.0#ca7224b634b11c61a099ed1c6293a0e26de6dcd4"
+source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=v1.5.0#f708d9eaac702a5d5d0a8ac7532b754add9b4e15"
 dependencies = [
  "anyhow",
  "colored",
@@ -569,7 +569,7 @@ dependencies = [
 [[package]]
 name = "era-compiler-vyper"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-compiler-vyper?branch=v1.5.0#868684970e70016860d134b87cf8f8879a3865c2"
+source = "git+https://github.com/matter-labs/era-compiler-vyper?branch=v1.5.0#74706990b4c0caa4c5e63e2ac824082ba56e08fe"
 dependencies = [
  "anyhow",
  "colored",
@@ -775,7 +775,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -1098,8 +1098,8 @@ dependencies = [
 
 [[package]]
 name = "inkwell"
-version = "0.1.0"
-source = "git+https://github.com/matter-labs-forks/inkwell?branch=llvm-15#98a023834492fe59b4ae97c405f75626437fced0"
+version = "0.4.0"
+source = "git+https://github.com/matter-labs-forks/inkwell?branch=llvm-17#c0821d7234b867b79baf29b87a3fb0c751eccad2"
 dependencies = [
  "either",
  "inkwell_internals",
@@ -1108,16 +1108,17 @@ dependencies = [
  "once_cell",
  "parking_lot",
  "serde",
+ "thiserror",
 ]
 
 [[package]]
 name = "inkwell_internals"
-version = "0.6.0"
-source = "git+https://github.com/matter-labs-forks/inkwell?branch=llvm-15#98a023834492fe59b4ae97c405f75626437fced0"
+version = "0.9.0"
+source = "git+https://github.com/matter-labs-forks/inkwell?branch=llvm-17#c0821d7234b867b79baf29b87a3fb0c751eccad2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -1143,9 +1144,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.29"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f08474e32172238f2827bd160c67871cdb2801430f65c3979184dc362e3ca118"
+checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2"
 dependencies = [
  "libc",
 ]
@@ -1247,13 +1248,14 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "llvm-sys"
-version = "150.0.5"
-source = "git+https://github.com/matter-labs-forks/llvm-sys.rs?branch=llvm-15.0#049dba7d1a8154f01c6267e8612504d56e651088"
+version = "170.0.1"
+source = "git+https://github.com/matter-labs-forks/llvm-sys.rs?branch=llvm-17.0#d165991787fe71259076aeabe25019f2e94c2a4b"
 dependencies = [
+ "anyhow",
  "cc",
  "lazy_static",
  "libc",
- "regex",
+ "regex-lite",
  "semver",
 ]
 
@@ -1338,9 +1340,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -1429,7 +1431,7 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -1546,7 +1548,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -1645,9 +1647,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
  "unicode-ident",
 ]
@@ -1805,6 +1807,12 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-lite"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.3"
@@ -2054,29 +2062,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.198"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.198"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
  "itoa",
  "ryu",
@@ -2279,9 +2287,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.58"
+version = "2.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2356,7 +2364,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -2475,7 +2483,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -2582,7 +2590,7 @@ checksum = "2266fcb904c50fb17fda4c9a751a1715629ecf8b21f4c9d78b4890fb71525d71"
 [[package]]
 name = "vm2"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/vm2#01b5d087cc49c0fc8589f46b62feee86f7a58da1"
+source = "git+https://github.com/matter-labs/vm2#66689ad17c1891d73dbe0fb0cc0a6ca65f453e1c"
 dependencies = [
  "enum_dispatch",
  "primitive-types",
@@ -2626,7 +2634,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
  "wasm-bindgen-shared",
 ]
 
@@ -2660,7 +2668,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2777,7 +2785,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -2797,17 +2805,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
@@ -2818,9 +2827,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -2830,9 +2839,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -2842,9 +2851,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -2854,9 +2869,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -2866,9 +2881,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -2878,9 +2893,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -2890,9 +2905,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
diff --git a/Cargo.toml b/Cargo.toml
index 064aa885..7a574496 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,6 @@ members = [
     "solidity_adapter",
     "coverage_watcher",
     "benchmark_analyzer",
-    "fuzz"
+    "fuzzer"
 ]
 resolver = "2"
diff --git a/benchmark_analyzer/src/benchmark_analyzer/arguments.rs b/benchmark_analyzer/src/benchmark_analyzer/arguments.rs
index 7d3996de..2af7f54e 100644
--- a/benchmark_analyzer/src/benchmark_analyzer/arguments.rs
+++ b/benchmark_analyzer/src/benchmark_analyzer/arguments.rs
@@ -23,6 +23,10 @@ pub struct Arguments {
     /// The output file. If unset, the result is printed to `stdout`.
     #[structopt(short = "o", long = "output-file")]
     pub output_path: Option<PathBuf>,
+
+    /// Maximum number of results displayed in a group.
+    #[structopt(short = "gm", long = "group-max", default_value = "100")]
+    pub group_max: usize,
 }
 
 impl Arguments {
diff --git a/benchmark_analyzer/src/benchmark_analyzer/main.rs b/benchmark_analyzer/src/benchmark_analyzer/main.rs
index 1ba8bca5..e0a0d8a6 100644
--- a/benchmark_analyzer/src/benchmark_analyzer/main.rs
+++ b/benchmark_analyzer/src/benchmark_analyzer/main.rs
@@ -24,7 +24,7 @@ fn main() -> anyhow::Result<()> {
             let mut file = std::fs::File::create(output_path)?;
             for (group_name, mut results) in groups_results.into_iter() {
                 results.sort_worst();
-                results.print_worst_results(100, group_name);
+                results.print_worst_results(arguments.group_max, group_name);
                 results.write_all(&mut file, group_name)?;
                 writeln!(file)?;
                 println!();
@@ -35,7 +35,7 @@ fn main() -> anyhow::Result<()> {
             let mut stdout = std::io::stdout();
             for (group_name, mut results) in groups_results.into_iter() {
                 results.sort_worst();
-                results.print_worst_results(100, group_name);
+                results.print_worst_results(arguments.group_max, group_name);
                 results.write_all(&mut stdout, group_name)?;
                 writeln!(stdout)?;
                 println!();
diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml
index ff48c545..3a7d82df 100644
--- a/compiler_tester/Cargo.toml
+++ b/compiler_tester/Cargo.toml
@@ -70,6 +70,6 @@ features = ["blocking"]
 
 [dependencies.inkwell]
 git = "https://github.com/matter-labs-forks/inkwell"
-branch = "llvm-15"
+branch = "llvm-17"
 default-features = false
-features = ["llvm15-0", "no-libffi-linking", "target-eravm", "target-evm"]
+features = ["llvm17-0", "no-libffi-linking", "target-eravm", "target-evm"]
diff --git a/compiler_tester/src/compilers/cache/mod.rs b/compiler_tester/src/compilers/cache/mod.rs
index 710ed19d..dbd2b7fb 100644
--- a/compiler_tester/src/compilers/cache/mod.rs
+++ b/compiler_tester/src/compilers/cache/mod.rs
@@ -96,7 +96,7 @@ where
             .expect("The value is not being evaluated")
             .unwrap_value()
             .as_ref()
-            .map(|value| value.clone())
+            .map(|value| value.to_owned())
             .map_err(|error| anyhow::anyhow!("{}", error))
     }
 
diff --git a/era-contracts b/era-contracts
index 46dea10f..4aa70061 160000
--- a/era-contracts
+++ b/era-contracts
@@ -1 +1 @@
-Subproject commit 46dea10f00af98473952c7fafa0619e5d72e8e26
+Subproject commit 4aa7006153ad571643342dff22c16eaf4a70fdc1
diff --git a/fuzz/.gitignore b/fuzzer/.gitignore
similarity index 100%
rename from fuzz/.gitignore
rename to fuzzer/.gitignore
diff --git a/fuzz/Cargo.toml b/fuzzer/Cargo.toml
similarity index 100%
rename from fuzz/Cargo.toml
rename to fuzzer/Cargo.toml
index a1b3c6f1..ee74dde5 100644
--- a/fuzz/Cargo.toml
+++ b/fuzzer/Cargo.toml
@@ -3,6 +3,9 @@ name = "compiler-tester-fuzz"
 version = "1.5.0"
 edition = "2021"
 
+[package.metadata]
+cargo-fuzz = true
+
 [[bin]]
 name = "demo"
 path = "fuzz_targets/demo.rs"
@@ -17,9 +20,6 @@ test = false
 doc = false
 bench = false
 
-[package.metadata]
-cargo-fuzz = true
-
 [dependencies]
 libfuzzer-sys = "0.4"
 anyhow = "1.0"
diff --git a/fuzz/README.md b/fuzzer/README.md
similarity index 100%
rename from fuzz/README.md
rename to fuzzer/README.md
diff --git a/fuzz/fuzz_contracts/demo/demo.md b/fuzzer/fuzz_contracts/demo/demo.md
similarity index 100%
rename from fuzz/fuzz_contracts/demo/demo.md
rename to fuzzer/fuzz_contracts/demo/demo.md
diff --git a/fuzz/fuzz_contracts/demo/demo.sol b/fuzzer/fuzz_contracts/demo/demo.sol
similarity index 100%
rename from fuzz/fuzz_contracts/demo/demo.sol
rename to fuzzer/fuzz_contracts/demo/demo.sol
diff --git a/fuzz/fuzz_contracts/optimizer_bug/optimizer_bug.sol b/fuzzer/fuzz_contracts/optimizer_bug/optimizer_bug.sol
similarity index 100%
rename from fuzz/fuzz_contracts/optimizer_bug/optimizer_bug.sol
rename to fuzzer/fuzz_contracts/optimizer_bug/optimizer_bug.sol
diff --git a/fuzz/fuzz_targets/common.rs b/fuzzer/fuzz_targets/common.rs
similarity index 100%
rename from fuzz/fuzz_targets/common.rs
rename to fuzzer/fuzz_targets/common.rs
diff --git a/fuzz/fuzz_targets/demo.rs b/fuzzer/fuzz_targets/demo.rs
similarity index 100%
rename from fuzz/fuzz_targets/demo.rs
rename to fuzzer/fuzz_targets/demo.rs
diff --git a/fuzz/fuzz_targets/optimizer_bug.rs b/fuzzer/fuzz_targets/optimizer_bug.rs
similarity index 100%
rename from fuzz/fuzz_targets/optimizer_bug.rs
rename to fuzzer/fuzz_targets/optimizer_bug.rs
diff --git a/solidity b/solidity
index 6040a521..30d78788 160000
--- a/solidity
+++ b/solidity
@@ -1 +1 @@
-Subproject commit 6040a521021f8168107ced1b54a21625b8cce632
+Subproject commit 30d78788941b5f891c96fe8a1c7b924c32a1478c