diff --git a/Cargo.lock b/Cargo.lock
index 5f5c0658e8..5653ef9b75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -547,7 +547,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "heck",
  "indexmap",
  "log",
@@ -653,9 +653,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.3"
+version = "3.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df386a2d0f35bdefc0642fd8bcb2cd28243959f028abfd22fbade6f7d30980e"
+checksum = "d53da17d37dba964b9b3ecb5c5a1f193a2762c700e6829201e645b9381c99dc7"
 dependencies = [
  "atty",
  "bitflags",
@@ -670,9 +670,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.3"
+version = "3.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b740354ad9fcf20e27b46d921be4bb3712f5b3c2c7a89ba68a72a8e51d3a47f"
+checksum = "c11d40217d16aee8508cc8e5fde8b4ff24639758608e5374e731b53f85749fb9"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -1588,7 +1588,7 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 name = "go-grpc-gateway-testing"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "futures",
  "grpcio",
@@ -2276,7 +2276,7 @@ dependencies = [
 name = "mc-admin-http-gateway"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "grpcio",
  "mc-common",
  "mc-util-grpc",
@@ -2775,7 +2775,7 @@ dependencies = [
 name = "mc-consensus-mint-client"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "grpcio",
  "hex",
@@ -2827,7 +2827,7 @@ dependencies = [
 name = "mc-consensus-scp-play"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "mc-common",
  "mc-consensus-scp",
  "mc-transaction-core",
@@ -2841,7 +2841,7 @@ version = "1.3.0-pre0"
 dependencies = [
  "base64",
  "chrono",
- "clap 3.2.3",
+ "clap 3.2.5",
  "curve25519-dalek",
  "displaydoc",
  "fs_extra",
@@ -2904,7 +2904,7 @@ name = "mc-consensus-service-config"
 version = "1.3.0-pre0"
 dependencies = [
  "base64",
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "hex",
  "mc-attest-core",
@@ -3181,7 +3181,7 @@ name = "mc-crypto-x509-test-vectors"
 version = "1.3.0-pre0"
 dependencies = [
  "cargo-emit",
- "clap 3.2.3",
+ "clap 3.2.5",
  "mc-crypto-keys",
  "mc-util-build-script",
  "pem",
@@ -3246,7 +3246,7 @@ dependencies = [
 name = "mc-fog-distribution"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "crossbeam-channel",
  "curve25519-dalek",
  "grpcio",
@@ -3304,7 +3304,7 @@ name = "mc-fog-ingest-client"
 version = "1.3.0-pre0"
 dependencies = [
  "assert_cmd",
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "grpcio",
  "hex",
@@ -3449,7 +3449,7 @@ dependencies = [
 name = "mc-fog-ingest-server"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "dirs",
  "displaydoc",
  "futures",
@@ -3662,7 +3662,7 @@ dependencies = [
 name = "mc-fog-ledger-server"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "futures",
  "grpcio",
@@ -3733,7 +3733,7 @@ dependencies = [
 name = "mc-fog-load-testing"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "grpcio",
  "mc-account-keys",
  "mc-blockchain-types",
@@ -3806,7 +3806,7 @@ dependencies = [
 name = "mc-fog-overseer-server"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "grpcio",
  "lazy_static",
@@ -3889,7 +3889,7 @@ name = "mc-fog-report-cli"
 version = "1.3.0-pre0"
 dependencies = [
  "base64",
- "clap 3.2.3",
+ "clap 3.2.5",
  "grpcio",
  "hex",
  "mc-account-keys",
@@ -3927,7 +3927,7 @@ dependencies = [
 name = "mc-fog-report-server"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "futures",
  "grpcio",
@@ -4000,7 +4000,7 @@ name = "mc-fog-sample-paykit"
 version = "1.3.0-pre0"
 dependencies = [
  "cargo-emit",
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "futures",
  "grpcio",
@@ -4096,7 +4096,7 @@ name = "mc-fog-sql-recovery-db"
 version = "1.3.0-pre0"
 dependencies = [
  "chrono",
- "clap 3.2.3",
+ "clap 3.2.5",
  "diesel",
  "diesel-derive-enum",
  "diesel_migrations",
@@ -4129,7 +4129,7 @@ dependencies = [
 name = "mc-fog-test-client"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "grpcio",
  "hex_fmt",
@@ -4162,7 +4162,7 @@ dependencies = [
 name = "mc-fog-test-infra"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "digest 0.10.3",
  "hex",
  "mc-account-keys",
@@ -4338,7 +4338,7 @@ dependencies = [
 name = "mc-fog-view-load-test"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "grpcio",
  "mc-account-keys",
  "mc-attest-verifier",
@@ -4380,7 +4380,7 @@ dependencies = [
 name = "mc-fog-view-server"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "futures",
  "grpcio",
@@ -4459,7 +4459,7 @@ dependencies = [
 name = "mc-ledger-distribution"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "dirs",
  "displaydoc",
  "mc-api",
@@ -4482,7 +4482,7 @@ dependencies = [
 name = "mc-ledger-from-archive"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "mc-api",
  "mc-common",
  "mc-ledger-db",
@@ -4493,7 +4493,7 @@ dependencies = [
 name = "mc-ledger-migration"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "lmdb-rkv",
  "mc-common",
  "mc-ledger-db",
@@ -4538,7 +4538,7 @@ dependencies = [
 name = "mc-mint-auditor"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "diesel",
  "diesel_migrations",
  "displaydoc",
@@ -4591,7 +4591,7 @@ name = "mc-mobilecoind"
 version = "1.3.0-pre0"
 dependencies = [
  "aes-gcm",
- "clap 3.2.3",
+ "clap 3.2.5",
  "crossbeam-channel",
  "displaydoc",
  "grpcio",
@@ -4676,7 +4676,7 @@ dependencies = [
 name = "mc-mobilecoind-dev-faucet"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "grpcio",
  "hex",
  "mc-account-keys",
@@ -4698,7 +4698,7 @@ dependencies = [
 name = "mc-mobilecoind-json"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "grpcio",
  "hex",
  "mc-api",
@@ -4866,7 +4866,7 @@ dependencies = [
 name = "mc-sgx-css-dump"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "hex_fmt",
  "mc-sgx-css",
 ]
@@ -5120,7 +5120,7 @@ dependencies = [
 name = "mc-util-b58-decoder"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "hex",
  "mc-api",
 ]
@@ -5183,7 +5183,7 @@ dependencies = [
 name = "mc-util-cli"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "mc-util-build-info",
 ]
 
@@ -5213,7 +5213,7 @@ dependencies = [
 name = "mc-util-generate-sample-ledger"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "hex",
  "mc-account-keys",
  "mc-blockchain-types",
@@ -5234,7 +5234,7 @@ name = "mc-util-grpc"
 version = "1.3.0-pre0"
 dependencies = [
  "base64",
- "clap 3.2.3",
+ "clap 3.2.5",
  "cookie",
  "displaydoc",
  "futures",
@@ -5267,7 +5267,7 @@ dependencies = [
 name = "mc-util-grpc-admin-tool"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "grpcio",
  "mc-common",
  "mc-util-grpc",
@@ -5278,7 +5278,7 @@ dependencies = [
 name = "mc-util-grpc-token-generator"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "hex",
  "mc-common",
  "mc-util-grpc",
@@ -5294,7 +5294,7 @@ name = "mc-util-keyfile"
 version = "1.3.0-pre0"
 dependencies = [
  "base64",
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "hex",
  "mc-account-keys",
@@ -5379,7 +5379,7 @@ dependencies = [
 name = "mc-util-seeded-ed25519-key-gen"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "hex",
  "mc-crypto-keys",
  "mc-util-from-random",
@@ -5413,7 +5413,7 @@ dependencies = [
 name = "mc-util-test-helper"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "itertools",
  "lazy_static",
  "mc-account-keys",
@@ -5469,7 +5469,7 @@ dependencies = [
 name = "mc-watcher"
 version = "1.3.0-pre0"
 dependencies = [
- "clap 3.2.3",
+ "clap 3.2.5",
  "displaydoc",
  "futures",
  "grpcio",