diff --git a/Cargo.lock b/Cargo.lock
index 5cd12d64c928c..8d6a98a1fdaeb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -667,7 +667,7 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 [[package]]
 name = "bytecode-interpreter-crypto"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "curve25519-dalek-fiat",
@@ -3293,7 +3293,7 @@ dependencies = [
 [[package]]
 name = "move-abigen"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3309,7 +3309,7 @@ dependencies = [
 [[package]]
 name = "move-binary-format"
 version = "0.0.3"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "move-core-types",
@@ -3322,12 +3322,12 @@ dependencies = [
 [[package]]
 name = "move-borrow-graph"
 version = "0.0.1"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 
 [[package]]
 name = "move-bytecode-source-map"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3342,7 +3342,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-utils"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -3354,7 +3354,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-verifier"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -3366,7 +3366,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-viewer"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "clap 3.1.18",
@@ -3383,7 +3383,7 @@ dependencies = [
 [[package]]
 name = "move-cli"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3424,7 +3424,7 @@ dependencies = [
 [[package]]
 name = "move-command-line-common"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "difference",
@@ -3439,7 +3439,7 @@ dependencies = [
 [[package]]
 name = "move-compiler"
 version = "0.0.1"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3468,7 +3468,7 @@ dependencies = [
 [[package]]
 name = "move-core-types"
 version = "0.0.4"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3483,7 +3483,7 @@ dependencies = [
 [[package]]
 name = "move-coverage"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3503,7 +3503,7 @@ dependencies = [
 [[package]]
 name = "move-disassembler"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "clap 3.1.18",
@@ -3521,7 +3521,7 @@ dependencies = [
 [[package]]
 name = "move-docgen"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "codespan",
@@ -3539,7 +3539,7 @@ dependencies = [
 [[package]]
 name = "move-errmapgen"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3553,7 +3553,7 @@ dependencies = [
 [[package]]
 name = "move-ir-compiler"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3572,7 +3572,7 @@ dependencies = [
 [[package]]
 name = "move-ir-to-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "codespan-reporting",
@@ -3591,7 +3591,7 @@ dependencies = [
 [[package]]
 name = "move-ir-to-bytecode-syntax"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "hex",
@@ -3604,7 +3604,7 @@ dependencies = [
 [[package]]
 name = "move-ir-types"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "hex",
@@ -3618,7 +3618,7 @@ dependencies = [
 [[package]]
 name = "move-model"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "codespan",
@@ -3644,7 +3644,7 @@ dependencies = [
 [[package]]
 name = "move-package"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3677,7 +3677,7 @@ dependencies = [
 [[package]]
 name = "move-prover"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3714,7 +3714,7 @@ dependencies = [
 [[package]]
 name = "move-prover-boogie-backend"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3742,7 +3742,7 @@ dependencies = [
 [[package]]
 name = "move-read-write-set-types"
 version = "0.0.3"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -3753,7 +3753,7 @@ dependencies = [
 [[package]]
 name = "move-resource-viewer"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3768,7 +3768,7 @@ dependencies = [
 [[package]]
 name = "move-stackless-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "codespan",
  "codespan-reporting",
@@ -3795,7 +3795,7 @@ dependencies = [
 [[package]]
 name = "move-stackless-bytecode-interpreter"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bytecode-interpreter-crypto",
@@ -3813,7 +3813,7 @@ dependencies = [
 [[package]]
 name = "move-stdlib"
 version = "0.1.1"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "log",
@@ -3835,7 +3835,7 @@ dependencies = [
 [[package]]
 name = "move-symbol-pool"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "once_cell",
  "serde 1.0.138",
@@ -3844,7 +3844,7 @@ dependencies = [
 [[package]]
 name = "move-table-extension"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "bcs",
@@ -3861,7 +3861,7 @@ dependencies = [
 [[package]]
 name = "move-transactional-test-runner"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "clap 3.1.18",
@@ -3892,9 +3892,10 @@ dependencies = [
 [[package]]
 name = "move-unit-test"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
+ "better_any",
  "clap 3.1.18",
  "codespan-reporting",
  "colored",
@@ -3922,7 +3923,7 @@ dependencies = [
 [[package]]
 name = "move-vm-runtime"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "better_any",
  "fail",
@@ -3939,7 +3940,7 @@ dependencies = [
 [[package]]
 name = "move-vm-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "move-core-types",
@@ -3948,7 +3949,7 @@ dependencies = [
 [[package]]
 name = "move-vm-types"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "bcs",
  "move-binary-format",
@@ -5271,7 +5272,7 @@ dependencies = [
 [[package]]
 name = "read-write-set"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -5286,7 +5287,7 @@ dependencies = [
 [[package]]
 name = "read-write-set-dynamic"
 version = "0.1.0"
-source = "git+https://github.com/move-language/move?rev=95999a9818091e382fb1c6016e68829f1dfc3127#95999a9818091e382fb1c6016e68829f1dfc3127"
+source = "git+https://github.com/move-language/move?rev=f07e99473e6edfff22f30596dd493ac770f0bb4a#f07e99473e6edfff22f30596dd493ac770f0bb4a"
 dependencies = [
  "anyhow",
  "move-binary-format",
diff --git a/crates/generate-json-rpc-spec/Cargo.toml b/crates/generate-json-rpc-spec/Cargo.toml
index 7648eb21c34d3..4a511786d9e2a 100644
--- a/crates/generate-json-rpc-spec/Cargo.toml
+++ b/crates/generate-json-rpc-spec/Cargo.toml
@@ -24,4 +24,4 @@ sui-config = { path = "../sui-config" }
 test-utils = { path = "../test-utils" }
 workspace-hack = { path = "../workspace-hack"}
 
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
diff --git a/crates/sui-adapter/Cargo.toml b/crates/sui-adapter/Cargo.toml
index 4d29d6ee2c6a5..26efaf767ca53 100644
--- a/crates/sui-adapter/Cargo.toml
+++ b/crates/sui-adapter/Cargo.toml
@@ -12,9 +12,9 @@ anyhow = { version = "1.0.58", features = ["backtrace"] }
 bcs = "0.1.3"
 once_cell = "1.11.0"
 
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 sui-framework = { path = "../sui-framework" }
 sui-verifier = { path = "../sui-verifier" }
@@ -22,4 +22,4 @@ sui-types = { path = "../sui-types" }
 workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml
index 7075161a35168..530c3637db4d5 100644
--- a/crates/sui-benchmark/Cargo.toml
+++ b/crates/sui-benchmark/Cargo.toml
@@ -30,7 +30,7 @@ sui-core = { path = "../sui-core" }
 sui-config = { path = "../sui-config" }
 sui-types = { path = "../sui-types" }
 
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
 narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "node" }
 
 workspace-hack = { path = "../workspace-hack"}
diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
index 1837cca1e0d16..eb4844ec2b4b7 100644
--- a/crates/sui-config/Cargo.toml
+++ b/crates/sui-config/Cargo.toml
@@ -21,8 +21,8 @@ tracing = "0.1.34"
 
 narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "config" }
 narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "crypto" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 sui-framework = { path = "../sui-framework" }
 sui-adapter = { path = "../sui-adapter" }
diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml
index 0f2bfc1bb35f6..fd15fa4399bf2 100644
--- a/crates/sui-core/Cargo.toml
+++ b/crates/sui-core/Cargo.toml
@@ -38,10 +38,10 @@ sui-config = { path = "../sui-config" }
 sui-json = { path = "../sui-json" }
 sui-json-rpc-api = { path = "../sui-json-rpc-api" }
 
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4"}
 mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }
@@ -54,7 +54,7 @@ workspace-hack = { path = "../workspace-hack"}
 [dev-dependencies]
 clap = { version = "3.1.17", features = ["derive"] }
 rand = "0.7.3"
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 serde-reflection = "0.3.6"
 serde_yaml = "0.8.23"
diff --git a/crates/sui-framework-build/Cargo.toml b/crates/sui-framework-build/Cargo.toml
index 7b591ef9c7373..7ccafdd06a786 100644
--- a/crates/sui-framework-build/Cargo.toml
+++ b/crates/sui-framework-build/Cargo.toml
@@ -12,10 +12,10 @@ publish = false
 sui-types = { path = "../sui-types" }
 sui-verifier = { path = "../../crates/sui-verifier" }
 
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-compiler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-compiler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 workspace-hack = { path = "../workspace-hack"}
diff --git a/crates/sui-framework/Cargo.toml b/crates/sui-framework/Cargo.toml
index abe6acd571f76..ef3b5020f7413 100644
--- a/crates/sui-framework/Cargo.toml
+++ b/crates/sui-framework/Cargo.toml
@@ -17,14 +17,14 @@ once_cell = "1.11.0"
 sui-types = { path = "../sui-types" }
 sui-framework-build = { path = "../sui-framework-build" }
 
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-cli = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-stdlib = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-unit-test = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-cli = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-stdlib = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-unit-test = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 workspace-hack = { path = "../workspace-hack"}
 
@@ -32,8 +32,8 @@ workspace-hack = { path = "../workspace-hack"}
 anyhow = { version = "1.0.58", features = ["backtrace"] }
 bcs = "0.1.3"
 sui-framework-build = { path = "../sui-framework-build" }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 [package.metadata.cargo-udeps.ignore]
 normal = ["move-cli", "move-unit-test"]
diff --git a/crates/sui-framework/src/lib.rs b/crates/sui-framework/src/lib.rs
index 98e7c9894ec18..c037d3c2cca53 100644
--- a/crates/sui-framework/src/lib.rs
+++ b/crates/sui-framework/src/lib.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use move_binary_format::CompiledModule;
-use move_cli::package::cli::UnitTestResult;
+use move_cli::base::test::UnitTestResult;
 use move_package::BuildConfig;
 use move_unit_test::UnitTestingConfig;
 use num_enum::TryFromPrimitive;
@@ -120,7 +120,7 @@ pub fn run_move_unit_tests(
     let config = config
         .unwrap_or_else(|| UnitTestingConfig::default_with_bound(Some(MAX_UNIT_TEST_INSTRUCTIONS)));
 
-    move_cli::package::cli::run_move_unit_tests(
+    move_cli::base::test::run_move_unit_tests(
         path,
         build_config,
         UnitTestingConfig {
@@ -129,6 +129,7 @@ pub fn run_move_unit_tests(
         },
         natives::all_natives(MOVE_STDLIB_ADDRESS, SUI_FRAMEWORK_ADDRESS),
         compute_coverage,
+        &mut std::io::stdout(),
     )
 }
 
diff --git a/crates/sui-gateway/Cargo.toml b/crates/sui-gateway/Cargo.toml
index e5f18c3ed0f6e..0bd466bb50c5b 100644
--- a/crates/sui-gateway/Cargo.toml
+++ b/crates/sui-gateway/Cargo.toml
@@ -27,7 +27,7 @@ sui-node = { path = "../sui-node" }
 
 mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }
 workspace-hack = { path = "../workspace-hack"}
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 [dev-dependencies]
 test-utils = { path = "../test-utils" }
diff --git a/crates/sui-json-rpc-api/Cargo.toml b/crates/sui-json-rpc-api/Cargo.toml
index 76aa32778f47f..324c99cec4d31 100644
--- a/crates/sui-json-rpc-api/Cargo.toml
+++ b/crates/sui-json-rpc-api/Cargo.toml
@@ -20,8 +20,8 @@ either = "1.6.1"
 itertools = "0.10.3"
 ed25519-dalek = { version = "1.0.1", features = ["batch", "serde"] }
 
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 sui-types = { path = "../sui-types" }
 sui-json = { path = "../sui-json" }
diff --git a/crates/sui-json/Cargo.toml b/crates/sui-json/Cargo.toml
index 98886889b8867..76697b6f36f47 100644
--- a/crates/sui-json/Cargo.toml
+++ b/crates/sui-json/Cargo.toml
@@ -17,13 +17,13 @@ schemars = "0.8.10"
 sui-types = { path = "../sui-types" }
 sui-verifier = { path = "../sui-verifier" }
 
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
 workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
 test-fuzz = "3.0.2"
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 workspace-hack = { path = "../workspace-hack"}
 
 sui-adapter = { path = "../sui-adapter" }
diff --git a/crates/sui-storage/Cargo.toml b/crates/sui-storage/Cargo.toml
index f25f7afcf07ff..b0339d057a0f7 100644
--- a/crates/sui-storage/Cargo.toml
+++ b/crates/sui-storage/Cargo.toml
@@ -24,7 +24,7 @@ strum_macros = "^0.24"
 
 sui-types = { path = "../sui-types" }
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4"}
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
 
 workspace-hack = { path = "../workspace-hack"}
 
diff --git a/crates/sui-transactional-test-runner/Cargo.toml b/crates/sui-transactional-test-runner/Cargo.toml
index d5dc477fe0e2a..540c019b9d29f 100644
--- a/crates/sui-transactional-test-runner/Cargo.toml
+++ b/crates/sui-transactional-test-runner/Cargo.toml
@@ -14,14 +14,14 @@ clap = { version = "3.1.8", features = ["derive"] }
 once_cell = "1.11.0"
 rand = "0.7.3"
 
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-command-line-common = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-compiler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-stdlib = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-compiler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-stdlib = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 sui-framework = { path = "../sui-framework" }
 sui-types = { path = "../sui-types" }
diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml
index c5f1f921840da..af8b9468c371e 100644
--- a/crates/sui-types/Cargo.toml
+++ b/crates/sui-types/Cargo.toml
@@ -40,12 +40,12 @@ rand_latest = { version = "0.8.5", package = "rand" }
 name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }
 
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-disassembler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-ir-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-disassembler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-ir-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "executor" }
 narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "crypto" }
diff --git a/crates/sui-verifier/Cargo.toml b/crates/sui-verifier/Cargo.toml
index e13ba93593758..a1ed3cb7b79ac 100644
--- a/crates/sui-verifier/Cargo.toml
+++ b/crates/sui-verifier/Cargo.toml
@@ -8,9 +8,9 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
 
 sui-types = { path = "../sui-types" }
 
diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml
index 31fac40bcce8c..59c5897bee9d7 100644
--- a/crates/sui/Cargo.toml
+++ b/crates/sui/Cargo.toml
@@ -32,10 +32,10 @@ colored = "2.0.0"
 unescape = "0.1.0"
 shell-words = "1.1.0"
 
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-unit-test = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-cli = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-unit-test = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-cli = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 
 
 workspace-hack = { path = "../workspace-hack"}
@@ -48,6 +48,6 @@ typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7d
 test-utils = { path = "../test-utils" }
 sui-quorum-driver = { path = "../sui-quorum-driver" }
 rand = "0.7.3"
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 sui-core = { path = "../sui-core" }
 sui-node = { path = "../sui-node" }
diff --git a/crates/sui/src/sui_commands.rs b/crates/sui/src/sui_commands.rs
index de72900918652..1ef7e0c8f90ad 100644
--- a/crates/sui/src/sui_commands.rs
+++ b/crates/sui/src/sui_commands.rs
@@ -5,10 +5,9 @@ use crate::client_commands::{SuiClientCommands, WalletContext};
 use crate::config::{GatewayConfig, GatewayType, SuiClientConfig};
 use crate::console::start_console;
 use crate::keytool::KeyToolCommand;
-use crate::sui_move::execute_move_command;
+use crate::sui_move::{self, execute_move_command};
 use anyhow::{anyhow, bail};
 use clap::*;
-use move_cli::package::cli::PackageCommand;
 use move_package::BuildConfig;
 use std::io::{stderr, stdout, Write};
 use std::num::NonZeroUsize;
@@ -96,24 +95,14 @@ pub enum SuiCommand {
     #[clap(name = "move")]
     Move {
         /// Path to a package which the command should be run with respect to.
-        #[clap(
-            long = "path",
-            short = 'p',
-            global = true,
-            parse(from_os_str),
-            default_value = "."
-        )]
-        package_path: PathBuf,
-        /// Whether we are printing in base64.
-        // TODO add this as a custom command to Package Command
-        #[clap(long, global = true)]
-        dump_bytecode_as_base64: bool,
+        #[clap(long = "path", short = 'p', global = true, parse(from_os_str))]
+        package_path: Option<PathBuf>,
         /// Package build options
         #[clap(flatten)]
         build_config: BuildConfig,
         /// Subcommands.
         #[clap(subcommand)]
-        cmd: PackageCommand,
+        cmd: sui_move::Command,
     },
 }
 
@@ -358,10 +347,9 @@ impl SuiCommand {
             }
             SuiCommand::Move {
                 package_path,
-                dump_bytecode_as_base64,
                 build_config,
                 cmd,
-            } => execute_move_command(package_path, dump_bytecode_as_base64, build_config, cmd),
+            } => execute_move_command(package_path, build_config, cmd),
         }
     }
 }
diff --git a/crates/sui/src/sui_move/build.rs b/crates/sui/src/sui_move/build.rs
index 4a50d540a836e..194f0e5fb12e6 100644
--- a/crates/sui/src/sui_move/build.rs
+++ b/crates/sui/src/sui_move/build.rs
@@ -1,19 +1,38 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use clap::Parser;
+use move_cli::base::{self, build};
 use move_package::BuildConfig;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
-pub fn execute(
-    path: &Path,
-    dump_bytecode_as_base64: bool,
-    build_config: BuildConfig,
-) -> anyhow::Result<()> {
-    if dump_bytecode_as_base64 {
-        let compiled_modules = sui_framework::build_move_package_to_base64(path, build_config)?;
-        println!("{:?}", compiled_modules);
-    } else {
-        sui_framework::build_and_verify_package(path, build_config)?;
+#[derive(Parser)]
+pub struct Build {
+    #[clap(flatten)]
+    pub build: build::Build,
+    /// Whether we are printing in base64.
+    #[clap(long, global = true)]
+    pub dump_bytecode_as_base64: bool,
+}
+
+impl Build {
+    pub fn execute(&self, path: Option<PathBuf>, build_config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = base::reroot_path(path)?;
+        Self::execute_internal(&rerooted_path, build_config, self.dump_bytecode_as_base64)
+    }
+    pub fn execute_internal(
+        rerooted_path: &Path,
+        build_config: BuildConfig,
+        dump_bytecode_as_base64: bool,
+    ) -> anyhow::Result<()> {
+        // find manifest file directory from a given path or (if missing) from current dir
+        if dump_bytecode_as_base64 {
+            let compiled_modules =
+                sui_framework::build_move_package_to_base64(rerooted_path, build_config)?;
+            println!("{:?}", compiled_modules);
+        } else {
+            sui_framework::build_and_verify_package(rerooted_path, build_config)?;
+        }
+        Ok(())
     }
-    Ok(())
 }
diff --git a/crates/sui/src/sui_move/mod.rs b/crates/sui/src/sui_move/mod.rs
index d3fb50734ed6c..b5baf1150ecb6 100644
--- a/crates/sui/src/sui_move/mod.rs
+++ b/crates/sui/src/sui_move/mod.rs
@@ -1,7 +1,8 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::package::cli::{PackageCommand, UnitTestResult};
+use clap::Parser;
+use move_cli::base::test::UnitTestResult;
 use move_package::BuildConfig;
 use move_unit_test::UnitTestingConfig;
 use std::path::PathBuf;
@@ -10,46 +11,34 @@ pub mod build;
 pub mod new;
 pub mod unit_test;
 
+#[derive(Parser)]
+pub enum Command {
+    Build(build::Build),
+    New(new::New),
+    Test(unit_test::Test),
+}
+
 pub fn execute_move_command(
-    package_path: PathBuf,
-    dump_bytecode_as_base64: bool,
+    package_path: Option<PathBuf>,
     build_config: BuildConfig,
-    command: PackageCommand,
+    command: Command,
 ) -> anyhow::Result<()> {
     match command {
-        PackageCommand::Build => {
-            build::execute(&package_path, dump_bytecode_as_base64, build_config)
-        }
-        PackageCommand::UnitTest {
-            instruction_execution_bound,
-            filter,
-            list,
-            num_threads,
-            report_statistics,
-            report_storage_on_error,
-            check_stackless_vm,
-            verbose_mode,
-            compute_coverage,
-        } => {
+        Command::Build(c) => c.execute(package_path, build_config),
+        Command::Test(c) => {
             let unit_test_config = UnitTestingConfig {
-                instruction_execution_bound,
-                filter,
-                list,
-                num_threads,
-                report_statistics,
-                report_storage_on_error,
-                check_stackless_vm,
-                verbose: verbose_mode,
+                instruction_execution_bound: c.test.instruction_execution_bound,
+                filter: c.test.filter.clone(),
+                list: c.test.list,
+                num_threads: c.test.num_threads,
+                report_statistics: c.test.report_statistics,
+                report_storage_on_error: c.test.report_storage_on_error,
+                check_stackless_vm: c.test.check_stackless_vm,
+                verbose: c.test.verbose_mode,
 
                 ..UnitTestingConfig::default_with_bound(None)
             };
-            let result = unit_test::execute(
-                &package_path,
-                dump_bytecode_as_base64,
-                build_config,
-                unit_test_config,
-                compute_coverage,
-            )?;
+            let result = c.execute(package_path, build_config, unit_test_config)?;
 
             // Return a non-zero exit code if any test failed
             if let UnitTestResult::Failure = result {
@@ -58,15 +47,6 @@ pub fn execute_move_command(
 
             Ok(())
         }
-        PackageCommand::New { name } => new::execute(&package_path, &name),
-        PackageCommand::Info => unimplemented!("'info' command not yet supported"),
-        PackageCommand::ErrMapGen { .. } => unimplemented!("'errmap' command not yet supported"),
-        PackageCommand::Prove { .. } => unimplemented!("'prove' command not yet supported"),
-        PackageCommand::CoverageReport { .. } => {
-            unimplemented!("'coverage' command not yet supported")
-        }
-        PackageCommand::BytecodeView { .. } => {
-            unimplemented!("'disassemble' command not yet supported")
-        }
+        Command::New(c) => c.execute(package_path),
     }
 }
diff --git a/crates/sui/src/sui_move/new.rs b/crates/sui/src/sui_move/new.rs
index 79c36aade16a7..4bf00fef52081 100644
--- a/crates/sui/src/sui_move/new.rs
+++ b/crates/sui/src/sui_move/new.rs
@@ -1,16 +1,28 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::package::cli::create_move_package;
-use std::path::Path;
+use clap::Parser;
+use move_cli::base::new;
+use std::path::PathBuf;
 
-pub fn execute(path: &Path, name: &String) -> anyhow::Result<()> {
-    create_move_package(path,
-                        name,
-                        "0.0.1",
-                        "Sui",
-                        "{ git = \"https://github.com/MystenLabs/sui.git\", subdir = \"crates/sui-framework\", rev = \"main\" }",
-                        &name.to_lowercase(),
-                        "0x0")?;
-    Ok(())
+const SUI_PKG_NAME: &str = "Sui";
+const SUI_PKG_PATH: &str = "{ git = \"https://github.com/MystenLabs/sui.git\", subdir = \"crates/sui-framework\", rev = \"main\" }";
+
+#[derive(Parser)]
+pub struct New {
+    #[clap(flatten)]
+    pub new: new::New,
+}
+
+impl New {
+    pub fn execute(self, path: Option<PathBuf>) -> anyhow::Result<()> {
+        let name = &self.new.name.to_lowercase();
+        self.new.execute(
+            path,
+            "0.0.1",
+            [(SUI_PKG_NAME, SUI_PKG_PATH)],
+            [(name, "0x0")],
+        )?;
+        Ok(())
+    }
 }
diff --git a/crates/sui/src/sui_move/unit_test.rs b/crates/sui/src/sui_move/unit_test.rs
index 87e66d84525db..b0d32da4525fe 100644
--- a/crates/sui/src/sui_move/unit_test.rs
+++ b/crates/sui/src/sui_move/unit_test.rs
@@ -2,24 +2,41 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use super::build;
-use anyhow::ensure;
-use move_cli::package::cli::UnitTestResult;
+use clap::Parser;
+use move_cli::base::{
+    self,
+    test::{self, UnitTestResult},
+};
 use move_package::BuildConfig;
 use move_unit_test::UnitTestingConfig;
-use std::path::Path;
+use std::path::PathBuf;
 
-pub fn execute(
-    path: &Path,
-    dump_bytecode_as_base64: bool,
-    build_config: BuildConfig,
-    unit_test_config: UnitTestingConfig,
-    compute_coverage: bool,
-) -> anyhow::Result<UnitTestResult> {
-    ensure!(
-        !dump_bytecode_as_base64,
-        "dump-bytecode-as-base64 is meaningless for unit tests"
-    );
-    // pre build for Sui-specific verifications
-    build::execute(path, false, build_config.clone())?;
-    sui_framework::run_move_unit_tests(path, build_config, Some(unit_test_config), compute_coverage)
+#[derive(Parser)]
+pub struct Test {
+    #[clap(flatten)]
+    pub test: test::Test,
+}
+impl Test {
+    pub fn execute(
+        &self,
+        path: Option<PathBuf>,
+        build_config: BuildConfig,
+        unit_test_config: UnitTestingConfig,
+    ) -> anyhow::Result<UnitTestResult> {
+        // find manifest file directory from a given path or (if missing) from current dir
+        let rerooted_path = base::reroot_path(path)?;
+        // pre build for Sui-specific verifications
+        let dump_bytecode_as_base64 = false;
+        build::Build::execute_internal(
+            &rerooted_path,
+            build_config.clone(),
+            dump_bytecode_as_base64,
+        )?;
+        sui_framework::run_move_unit_tests(
+            &rerooted_path,
+            build_config,
+            Some(unit_test_config),
+            self.test.compute_coverage,
+        )
+    }
 }
diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml
index 2e49c7f7c93f4..03af9338c5daf 100644
--- a/crates/test-utils/Cargo.toml
+++ b/crates/test-utils/Cargo.toml
@@ -28,7 +28,7 @@ sui-node = { path = "../sui-node" }
 sui-swarm = { path = "../sui-swarm" }
 sui-types = { path = "../sui-types" }
 
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
 
 workspace-hack = { path = "../workspace-hack"}
diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml
index 4ff2fbf4d7289..17fb0ff76d91f 100644
--- a/crates/workspace-hack/Cargo.toml
+++ b/crates/workspace-hack/Cargo.toml
@@ -64,7 +64,7 @@ bls-crypto = { git = "https://github.com/huitseeker/celo-bls-snark-rs", branch =
 blst = { version = "0.3" }
 bs58 = { version = "0.4", features = ["alloc", "std"] }
 bstr = { version = "0.2", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] }
-bytecode-interpreter-crypto = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["fiat"] }
+bytecode-interpreter-crypto = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["fiat"] }
 byteorder = { version = "1", features = ["i128", "std"] }
 bytes = { version = "1", features = ["std"] }
 bzip2-sys = { version = "0.1", default-features = false, features = ["static"] }
@@ -258,41 +258,41 @@ minimal-lexical = { version = "0.2", default-features = false, features = ["std"
 miniz_oxide = { version = "0.5", default-features = false }
 mio = { version = "0.8", features = ["net", "os-ext", "os-poll"] }
 mockall = { version = "0.11", default-features = false }
-move-abigen = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-borrow-graph = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-bytecode-source-map = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-viewer = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-cli = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-command-line-common = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-compiler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-coverage = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-disassembler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-docgen = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-errmapgen = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-ir-compiler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-ir-to-bytecode = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-ir-to-bytecode-syntax = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-ir-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-model = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-prover = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-prover-boogie-backend = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-read-write-set-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-resource-viewer = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-stackless-bytecode = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-stdlib = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false, features = ["testing"] }
-move-symbol-pool = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-table-extension = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-unit-test = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["debugging", "testing"] }
-move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-abigen = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-borrow-graph = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-bytecode-source-map = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-viewer = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-cli = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-compiler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-coverage = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-disassembler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-docgen = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-errmapgen = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-ir-compiler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-ir-to-bytecode = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-ir-to-bytecode-syntax = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-ir-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-model = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-prover = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-prover-boogie-backend = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-read-write-set-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-stackless-bytecode = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-stdlib = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false, features = ["testing"] }
+move-symbol-pool = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-table-extension = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-unit-test = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["debugging", "testing"] }
+move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 multiaddr = { version = "0.14", features = ["url"] }
 multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] }
 multimap = { version = "0.8", default-features = false }
@@ -379,8 +379,8 @@ rand_xorshift = { version = "0.3", default-features = false }
 rand_xoshiro = { version = "0.6", default-features = false }
 rayon = { version = "1", default-features = false }
 rayon-core = { version = "1", default-features = false }
-read-write-set = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
+read-write-set = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
 ref-cast = { version = "1", default-features = false }
 regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
 regex-automata = { version = "0.1", features = ["regex-syntax", "std"] }
@@ -610,7 +610,7 @@ blst = { version = "0.3" }
 bs58 = { version = "0.4", features = ["alloc", "std"] }
 bstr = { version = "0.2", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] }
 bumpalo = { version = "3" }
-bytecode-interpreter-crypto = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["fiat"] }
+bytecode-interpreter-crypto = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["fiat"] }
 byteorder = { version = "1", features = ["i128", "std"] }
 bytes = { version = "1", features = ["std"] }
 bzip2-sys = { version = "0.1", default-features = false, features = ["static"] }
@@ -833,41 +833,41 @@ miniz_oxide = { version = "0.5", default-features = false }
 mio = { version = "0.8", features = ["net", "os-ext", "os-poll"] }
 mockall = { version = "0.11", default-features = false }
 mockall_derive = { version = "0.11", default-features = false }
-move-abigen = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-binary-format = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-borrow-graph = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-bytecode-source-map = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-bytecode-viewer = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-cli = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-command-line-common = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-compiler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-core-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["address20"] }
-move-coverage = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-disassembler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-docgen = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-errmapgen = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-ir-compiler = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-ir-to-bytecode = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-ir-to-bytecode-syntax = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-ir-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-model = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-package = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-prover = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-prover-boogie-backend = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-read-write-set-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-resource-viewer = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-stackless-bytecode = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-stdlib = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false, features = ["testing"] }
-move-symbol-pool = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-table-extension = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-unit-test = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-move-vm-runtime = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", features = ["debugging", "testing"] }
-move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
-move-vm-types = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127" }
+move-abigen = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-borrow-graph = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-bytecode-source-map = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-bytecode-viewer = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-cli = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-compiler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
+move-coverage = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-disassembler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-docgen = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-errmapgen = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-ir-compiler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-ir-to-bytecode = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-ir-to-bytecode-syntax = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-ir-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-model = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-prover = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-prover-boogie-backend = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-read-write-set-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-stackless-bytecode = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-stackless-bytecode-interpreter = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-stdlib = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false, features = ["testing"] }
+move-symbol-pool = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-table-extension = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-unit-test = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["debugging", "testing"] }
+move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
 multiaddr = { version = "0.14", features = ["url"] }
 multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] }
 multihash-derive = { version = "0.8", default-features = false, features = ["std"] }
@@ -975,8 +975,8 @@ rand_xorshift = { version = "0.3", default-features = false }
 rand_xoshiro = { version = "0.6", default-features = false }
 rayon = { version = "1", default-features = false }
 rayon-core = { version = "1", default-features = false }
-read-write-set = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
-read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "95999a9818091e382fb1c6016e68829f1dfc3127", default-features = false }
+read-write-set = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
+read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", default-features = false }
 readonly = { version = "0.2", default-features = false }
 ref-cast = { version = "1", default-features = false }
 ref-cast-impl = { version = "1", default-features = false }