diff --git a/Cargo.dev.toml b/Cargo.dev.toml
index b48bdab56..bc91c0836 100644
--- a/Cargo.dev.toml
+++ b/Cargo.dev.toml
@@ -30,55 +30,57 @@ resolver = "2"
 split-debuginfo = "unpacked"
 
 [patch.'https://github.com/paritytech/substrate']
-frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-frame-support = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-frame-system = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-session = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-api = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-core = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-io = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-std = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-trie = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-version = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-staking = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-storage = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-npos-elections-compact = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sc-executor = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-session = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
-sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
+frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+frame-support = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+frame-system = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+max-encoded-len = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+max-encoded-len-derive = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-session = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sc-executor = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-api = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-core = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-io = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-npos-elections-compact = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-session = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-staking = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-std = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-storage = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-trie = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-version = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
+sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "ea5d3570673d125dfe0b7da33b345c3c13195380" }
 
 # [patch.'https://github.com/paritytech/cumulus']
 # cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" }
diff --git a/auction/Cargo.toml b/auction/Cargo.toml
index 5b20b25a5..d0d9d2c1d 100644
--- a/auction/Cargo.toml
+++ b/auction/Cargo.toml
@@ -10,16 +10,16 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 [features]
 default = ["std"]
diff --git a/authority/Cargo.toml b/authority/Cargo.toml
index 5e768fcee..b984d755c 100644
--- a/authority/Cargo.toml
+++ b/authority/Cargo.toml
@@ -10,17 +10,17 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 [features]
 default = ["std"]
diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml
index f2a3ba4bf..d64711bf2 100644
--- a/bencher/Cargo.toml
+++ b/bencher/Cargo.toml
@@ -12,15 +12,15 @@ linregress = { version = "0.4.0", optional = true }
 serde = { version = "1.0.119", optional = true, features = ['derive'] }
 serde_json = {version = "1.0.64", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"], default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false, optional = true }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false, features = ["wasmtime"], optional = true }
-sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", optional = true }
-sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false, features = ["with-kvdb-rocksdb"], optional = true }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false, optional = true }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false, features = ["wasmtime"], optional = true }
+sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", optional = true }
+sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false, features = ["with-kvdb-rocksdb"], optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml
index 50c010eec..2e54659e5 100644
--- a/benchmarking/Cargo.toml
+++ b/benchmarking/Cargo.toml
@@ -11,17 +11,17 @@ edition = "2018"
 serde = { version = "1.0.124", optional = true }
 paste = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [dev-dependencies]
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 hex-literal = "0.2.1"
 
 [features]
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
index ab9f4b7cc..1ebdbdf78 100644
--- a/currencies/Cargo.toml
+++ b/currencies/Cargo.toml
@@ -10,19 +10,19 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" }
 
 [features]
diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml
index 18fe3a6cc..8b9d3ceba 100644
--- a/gradually-update/Cargo.toml
+++ b/gradually-update/Cargo.toml
@@ -10,12 +10,13 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/nft/Cargo.toml b/nft/Cargo.toml
index 387d4dfdf..a8fb0048f 100644
--- a/nft/Cargo.toml
+++ b/nft/Cargo.toml
@@ -10,15 +10,16 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 [features]
 default = ["std"]
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
index 148d662f3..8733998d8 100644
--- a/oracle/Cargo.toml
+++ b/oracle/Cargo.toml
@@ -10,19 +10,19 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml
index 014b27bb4..4c13f13e4 100644
--- a/oracle/rpc/Cargo.toml
+++ b/oracle/rpc/Cargo.toml
@@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.0.0"
 jsonrpc-core-client = "15.0.0"
 jsonrpc-derive = "15.0.0"
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" }
diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml
index 43d94034b..6b11c4e24 100644
--- a/oracle/rpc/runtime-api/Cargo.toml
+++ b/oracle/rpc/runtime-api/Cargo.toml
@@ -8,8 +8,8 @@ description = "Runtime API module for orml-oracle-rpc."
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml
index 27b5afc2b..2ad1ed25f 100644
--- a/rewards/Cargo.toml
+++ b/rewards/Cargo.toml
@@ -10,15 +10,16 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 [features]
 default = ["std"]
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 508cd5295..e191789f2 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -10,16 +10,17 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-support = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-support = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 # Patch doesn't work as `pallet-elections-phragmen` is now 4.0.0 version. Revert `rev` to `statemint` branch after
 # other `statemint` dependencies upgraded.
 pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs
index c757c0e2e..d19116e48 100644
--- a/tokens/src/lib.rs
+++ b/tokens/src/lib.rs
@@ -157,7 +157,13 @@ pub mod module {
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
 		/// The balance type
-		type Balance: Parameter + Member + AtLeast32BitUnsigned + Default + Copy + MaybeSerializeDeserialize;
+		type Balance: Parameter
+			+ Member
+			+ AtLeast32BitUnsigned
+			+ Default
+			+ Copy
+			+ MaybeSerializeDeserialize
+			+ MaxEncodedLen;
 
 		/// The amount type, should be signed version of `Balance`
 		type Amount: Signed
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index 4a318527b..912839907 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -10,14 +10,14 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 num-traits = { version = "0.2.14", default-features = false }
 impl-trait-for-tuples = "0.2.1"
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false }
-# xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3", default-features = false }
+# xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml
index 6e12e5250..aee349e9e 100644
--- a/unknown-tokens/Cargo.toml
+++ b/unknown-tokens/Cargo.toml
@@ -10,18 +10,18 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4", default-features = false }
 
 orml-xcm-support = { path = "../xcm-support", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 [features]
 default = ["std"]
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
index 22e609bce..cbad81d87 100644
--- a/utilities/Cargo.toml
+++ b/utilities/Cargo.toml
@@ -10,14 +10,14 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.64"
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 [features]
 default = ["std"]
diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml
index 921cd0ecf..228023627 100644
--- a/vesting/Cargo.toml
+++ b/vesting/Cargo.toml
@@ -10,16 +10,17 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 [features]
 default = ["std"]
diff --git a/vesting/src/tests.rs b/vesting/src/tests.rs
index 5331e513d..d89e7c5dd 100644
--- a/vesting/src/tests.rs
+++ b/vesting/src/tests.rs
@@ -92,8 +92,8 @@ fn add_new_vesting_schedule_merges_with_current_locked_balance_and_until() {
 		assert_ok!(Vesting::vested_transfer(Origin::signed(ALICE), BOB, another_schedule));
 
 		assert_eq!(
-			PalletBalances::locks(&BOB).pop(),
-			Some(BalanceLock {
+			PalletBalances::locks(&BOB).get(0),
+			Some(&BalanceLock {
 				id: VESTING_LOCK_ID,
 				amount: 17u64,
 				reasons: Reasons::All,
diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml
index 36f8516b5..781e12fa6 100644
--- a/weight-meter/Cargo.toml
+++ b/weight-meter/Cargo.toml
@@ -10,19 +10,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 spin = "0.7.1"
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 weight-meter-procedural = { path = "weight-meter-procedural", default-features = false }
 
 [dev-dependencies]
 serde = { version = "1.0.124" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3"}
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4"}
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 
 [features]
 default = ["std"]
diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml
index 74649604a..3beb8f201 100644
--- a/xcm-support/Cargo.toml
+++ b/xcm-support/Cargo.toml
@@ -10,13 +10,13 @@ edition = "2018"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4", default-features = false }
 
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml
index 667ae09be..d3c5501a3 100644
--- a/xtokens/Cargo.toml
+++ b/xtokens/Cargo.toml
@@ -10,30 +10,30 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
 
 cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.3", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4", default-features = false }
 
 orml-xcm-support = { path = "../xcm-support", default-features = false }
 orml-traits = { path = "../traits", default-features = false}
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
-polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
 xcm-simulator = { git = "https://github.com/shaunxw/xcm-simulator", branch = "master" }
 cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.3" }
 parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.3" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4" }
 
 orml-tokens = { path = "../tokens", version = "0.4.1-dev" }
 orml-traits = { path = "../traits", version = "0.4.1-dev" }