Merge branch 'dev' into experimental

[tqn]

In addition to the merge, we update the Cargo.toml of recursion/core-v2 to match that of recursion/core.

Result of git diff --no-ext-diff tqn/merge-dev-into-experimental -R after running git merge dev on experimental:

diff --git b/Cargo.lock a/Cargo.lock
index b40b55ea..fbbf78ca 100644
--- b/Cargo.lock
+++ a/Cargo.lock
@@ -4904,7 +4904,7 @@ dependencies = [
  "sp1-recursion-derive",
  "sp1-recursion-gnark-ffi",
  "sp1-recursion-program",
- "zkhash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zkhash",
 ]
 
 [[package]]
@@ -4968,18 +4968,19 @@ dependencies = [
  "sp1-primitives",
  "static_assertions",
  "tracing",
- "zkhash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zkhash",
 ]
 
 [[package]]
 name = "sp1-recursion-core-v2"
-version = "0.0.2-test"
+version = "1.0.0-rc.1"
 dependencies = [
  "arrayref",
  "backtrace",
  "ff 0.13.0",
  "hashbrown 0.14.5",
  "itertools 0.13.0",
+ "num_cpus",
  "p3-air",
  "p3-baby-bear",
  "p3-bn254-fr",
@@ -4993,7 +4994,6 @@ dependencies = [
  "p3-merkle-tree",
  "p3-poseidon2",
  "p3-symmetric",
- "p3-uni-stark",
  "p3-util",
  "rand",
  "serde",
@@ -5004,7 +5004,7 @@ dependencies = [
  "sp1-recursion-core",
  "static_assertions",
  "tracing",
- "zkhash 0.2.0 (git+https://github.com/HorizenLabs/poseidon2)",
+ "zkhash",
 ]
 
 [[package]]
@@ -6317,29 +6317,3 @@ dependencies = [
  "sha3",
  "subtle",
 ]
-
-[[package]]
-name = "zkhash"
-version = "0.2.0"
-source = "git+https://github.com/HorizenLabs/poseidon2#bb476b9ca38198cf5092487283c8b8c5d4317c4e"
-dependencies = [
- "ark-ff 0.4.2",
- "ark-std 0.4.0",
- "bitvec",
- "blake2",
- "bls12_381",
- "byteorder",
- "cfg-if",
- "group 0.12.1",
- "group 0.13.0",
- "halo2",
- "hex",
- "jubjub",
- "lazy_static",
- "pasta_curves 0.5.1",
- "rand",
- "serde",
- "sha2",
- "sha3",
- "subtle",
-]
diff --git b/Cargo.toml a/Cargo.toml
index 8a70b3e8..1c638a39 100644
--- b/Cargo.toml
+++ a/Cargo.toml
@@ -11,12 +11,9 @@ members = [
   "recursion/circuit",
   "recursion/compiler",
   "recursion/core",
-<<<<<<< HEAD
   "recursion/core-v2",
-=======
   "recursion/derive",
   "recursion/gnark-cli",
->>>>>>> dev
   "recursion/gnark-ffi",
   "recursion/program",
   "sdk",
@@ -55,6 +52,7 @@ sp1-primitives = { path = "primitives", version = "1.0.0-rc.1" }
 sp1-prover = { path = "prover", version = "1.0.0-rc.1" }
 sp1-recursion-compiler = { path = "recursion/compiler", version = "1.0.0-rc.1" }
 sp1-recursion-core = { path = "recursion/core", version = "1.0.0-rc.1", default-features = false }
+sp1-recursion-core-v2 = { path = "recursion/core-v2", version = "1.0.0-rc.1", default-features = false }
 sp1-recursion-derive = { path = "recursion/derive", version = "1.0.0-rc.1", default-features = false }
 sp1-recursion-gnark-ffi = { path = "recursion/gnark-ffi", version = "1.0.0-rc.1", default-features = false }
 sp1-recursion-program = { path = "recursion/program", version = "1.0.0-rc.1", default-features = false }
diff --git b/recursion/compiler/Cargo.toml a/recursion/compiler/Cargo.toml
index baa3a83a..15c4d92f 100644
--- b/recursion/compiler/Cargo.toml
+++ a/recursion/compiler/Cargo.toml
@@ -21,18 +21,11 @@ p3-poseidon2 = { workspace = true }
 p3-symmetric = { workspace = true }
 p3-util = { workspace = true }
 
-<<<<<<< HEAD
-sp1-core = { path = "../../core", version = "0.0.2-test" }
-sp1-primitives = { path = "../../primitives", version = "0.0.2-test" }
-sp1-recursion-core = { path = "../core", version = "0.0.2-test" }
-sp1-recursion-core-v2 = { path = "../core-v2", version = "0.0.2-test" }
-sp1-recursion-derive = { path = "../derive", version = "0.0.2-test" }
-=======
 sp1-core = { workspace = true }
 sp1-primitives = { workspace = true }
 sp1-recursion-core = { workspace = true }
+sp1-recursion-core-v2 = { workspace = true }
 sp1-recursion-derive = { workspace = true }
->>>>>>> dev
 
 itertools = "0.13.0"
 serde = { version = "1.0.204", features = ["derive"] }
diff --git b/recursion/core-v2/Cargo.toml a/recursion/core-v2/Cargo.toml
index 80ca19b6..5bb5059d 100644
--- b/recursion/core-v2/Cargo.toml
+++ a/recursion/core-v2/Cargo.toml
@@ -1,10 +1,13 @@
 [package]
 name = "sp1-recursion-core-v2"
-version = "0.0.2-test"
-edition = "2021"
 description = "SP1 is a performant, 100% open-source, contributor-friendly zkVM."
 readme = "../../README.md"
-license = "MIT OR Apache-2.0"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
 
 [dependencies]
 p3-field = { workspace = true }
@@ -15,11 +18,11 @@ p3-matrix = { workspace = true }
 p3-maybe-rayon = { workspace = true }
 p3-poseidon2 = { workspace = true }
 p3-symmetric = { workspace = true }
-sp1-derive = { path = "../../derive" }
-sp1-primitives = { path = "../../primitives" }
+sp1-derive = { workspace = true }
+sp1-primitives = { workspace = true }
 tracing = "0.1.40"
-sp1-core = { path = "../../core" }
-sp1-recursion-core = { path = "../core" }
+sp1-core = { workspace = true }
+sp1-recursion-core = { workspace = true }
 hashbrown = { version = "0.14.5", features = ["serde"] }
 itertools = "0.13.0"
 p3-bn254-fr = { workspace = true }
@@ -28,14 +31,14 @@ p3-commit = { workspace = true }
 p3-dft = { workspace = true }
 p3-challenger = { workspace = true }
 p3-fri = { workspace = true }
-p3-uni-stark = { workspace = true }
-zkhash = { git = "https://github.com/HorizenLabs/poseidon2" }
+zkhash = "0.2.0"
 ff = { version = "0.13", features = ["derive", "derive_bits"] }
 serde = { version = "1.0", features = ["derive", "rc"] }
-serde_with = "3.8.1"
+serde_with = "3.9.0"
 backtrace = { version = "0.3.71", features = ["serde"] }
 arrayref = "0.3.7"
 static_assertions = "1.1.0"
+num_cpus = "1.16.0"
 
 [dev-dependencies]
 rand = "0.8.5"