diff --git a/Cargo.dev.toml b/Cargo.dev.toml
index 17921391b..f136855e6 100644
--- a/Cargo.dev.toml
+++ b/Cargo.dev.toml
@@ -32,76 +32,72 @@ resolver = "2"
 split-debuginfo = "unpacked"
 
 [patch.'https://github.com/paritytech/substrate']
-frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-frame-support = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-frame-system = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-session = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sc-executor = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sc-utils = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-core = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-io = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-session = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-staking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-std = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-storage = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-trie = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-version = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" }
+frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+frame-support = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+frame-system = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-session = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sc-executor = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sc-utils = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-core = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-io = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-session = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-staking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-std = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-storage = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-trie = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-version = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" }
 
 [patch.'https://github.com/paritytech/cumulus']
-cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" }
-parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" }
+cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" }
+parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" }
 
 [patch.'https://github.com/paritytech/polkadot']
-xcm = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" }
-
-# TODO: https://github.com/paritytech/substrate/pull/11609
-[patch.crates-io]
-wasm-instrument = { git = "https://github.com/paritytech/wasm-instrument", rev = "184b3f8b3a13cf49e06de2bf5a13b9b74eaeb404" }
+xcm = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
+xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
+xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
+pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
+polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
+polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
+polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
+xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" }
diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml
index c9e0d3e03..a1f90840a 100644
--- a/asset-registry/Cargo.toml
+++ b/asset-registry/Cargo.toml
@@ -8,38 +8,38 @@ authors = ["Interlay Ltd, etc"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-support = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-support = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 # cumulus
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
 
 # polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"}
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23"}
 
 orml-tokens = { path = "../tokens" }
 orml-xtokens = { path = "../xtokens" }
diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs
index 9a41b838d..10074f3dc 100644
--- a/asset-registry/src/mock/para.rs
+++ b/asset-registry/src/mock/para.rs
@@ -156,7 +156,7 @@ pub type XcmRouter = ParachainXcmRouter<ParachainInfo>;
 pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom<Everything>);
 
 parameter_types! {
-	pub TreasuryAccount: AccountId = PalletId(*b"Treasury").into_account();
+	pub TreasuryAccount: AccountId = PalletId(*b"Treasury").into_account_truncating();
 }
 
 pub struct ToTreasury;
diff --git a/asset-registry/src/tests.rs b/asset-registry/src/tests.rs
index 01a2b5622..6289cfbeb 100644
--- a/asset-registry/src/tests.rs
+++ b/asset-registry/src/tests.rs
@@ -7,7 +7,7 @@ use frame_support::{assert_noop, assert_ok};
 use mock::*;
 use orml_traits::MultiCurrency;
 use polkadot_parachain::primitives::Sibling;
-use sp_runtime::AccountId32;
+use sp_runtime::{traits::AccountIdConversion, AccountId32};
 use xcm_simulator::TestExt;
 
 fn treasury_account() -> AccountId32 {
@@ -15,18 +15,15 @@ fn treasury_account() -> AccountId32 {
 }
 
 fn sibling_a_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(1).into_account()
+	Sibling::from(1).into_account_truncating()
 }
 
 fn sibling_b_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(2).into_account()
+	Sibling::from(2).into_account_truncating()
 }
 
 fn sibling_c_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(3).into_account()
+	Sibling::from(3).into_account_truncating()
 }
 
 // Not used in any unit tests, but it's super helpful for debugging. Let's
diff --git a/auction/Cargo.toml b/auction/Cargo.toml
index 67c8247e6..1288992ae 100644
--- a/auction/Cargo.toml
+++ b/auction/Cargo.toml
@@ -8,19 +8,19 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", 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.22" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/authority/Cargo.toml b/authority/Cargo.toml
index 3d74e1381..a71532415 100644
--- a/authority/Cargo.toml
+++ b/authority/Cargo.toml
@@ -8,20 +8,20 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml
index e8034f9c3..82394bfe4 100644
--- a/bencher/Cargo.toml
+++ b/bencher/Cargo.toml
@@ -24,18 +24,18 @@ serde_json = {version = "1.0.68", optional = true }
 hash-db = { version = "0.15.2", default-features = false, optional = true }
 bencher-procedural = { path = "bencher-procedural", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, features = ["wasmtime"], optional = true }
-sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", optional = true }
-sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, features = ["with-kvdb-rocksdb"], optional = true }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, features = ["wasmtime"], optional = true }
+sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", optional = true }
+sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, features = ["with-kvdb-rocksdb"], optional = true }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true }
 
 [features]
 default = ["std"]
diff --git a/bencher/src/bench_runner.rs b/bencher/src/bench_runner.rs
index 59fce68cf..5aa12f839 100644
--- a/bencher/src/bench_runner.rs
+++ b/bencher/src/bench_runner.rs
@@ -3,7 +3,7 @@ use super::{
 	tracker::{BenchTracker, BenchTrackerExt},
 };
 use frame_benchmarking::frame_support::sp_runtime::traits::Block;
-use sc_executor::{WasmExecutionMethod, WasmExecutor};
+use sc_executor::{WasmExecutionMethod, WasmExecutor, WasmtimeInstantiationStrategy};
 use sc_executor_common::runtime_blob::RuntimeBlob;
 use sp_externalities::Extensions;
 use sp_state_machine::{Ext, OverlayedChanges, StorageTransactionCache};
@@ -30,8 +30,15 @@ pub fn run<B: Block>(wasm_code: Vec<u8>) -> std::result::Result<Vec<u8>, sc_exec
 	let ext = Ext::<_, _>::new(&mut overlay, &mut cache, &state, Some(&mut extensions));
 	let mut bench_ext = BenchExt::new(ext, tracker);
 
-	let executor =
-		WasmExecutor::<ComposeHostFunctions>::new(WasmExecutionMethod::Compiled, Default::default(), 1, None, 1);
+	let executor = WasmExecutor::<ComposeHostFunctions>::new(
+		WasmExecutionMethod::Compiled {
+			instantiation_strategy: WasmtimeInstantiationStrategy::PoolingCopyOnWrite,
+		},
+		Default::default(),
+		1,
+		None,
+		1,
+	);
 
 	let blob = RuntimeBlob::uncompress_if_needed(&wasm_code[..]).unwrap();
 
diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml
index 418be8da5..125a14858 100644
--- a/bencher/test/Cargo.toml
+++ b/bencher/test/Cargo.toml
@@ -13,18 +13,18 @@ required-features = ["bench"]
 
 [dependencies]
 serde = { version = "1.0.136", optional = true }
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 orml-bencher = { path = "..", default-features = false }
 orml-weight-meter = { path = "../../weight-meter", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml
index 61b9fdcfb..e27c31278 100644
--- a/benchmarking/Cargo.toml
+++ b/benchmarking/Cargo.toml
@@ -11,19 +11,19 @@ edition = "2021"
 serde = { version = "1.0.136", optional = true }
 paste = "1.0.7"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 log = { version = "0.4.17", default-features = false }
 
 [dev-dependencies]
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 hex-literal = "0.3.4"
 
 [features]
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
index 1d8746b8b..d5cd45552 100644
--- a/currencies/Cargo.toml
+++ b/currencies/Cargo.toml
@@ -8,22 +8,22 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", 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.22" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" }
 
 [features]
diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs
index 1980b388e..675c4be34 100644
--- a/currencies/src/mock.rs
+++ b/currencies/src/mock.rs
@@ -70,7 +70,7 @@ parameter_type_with_key! {
 }
 
 parameter_types! {
-	pub DustAccount: AccountId = PalletId(*b"orml/dst").into_account();
+	pub DustAccount: AccountId = PalletId(*b"orml/dst").into_account_truncating();
 }
 
 impl orml_tokens::Config for Runtime {
diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml
index cb2844d75..369c4e64f 100644
--- a/gradually-update/Cargo.toml
+++ b/gradually-update/Cargo.toml
@@ -8,15 +8,15 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/nft/Cargo.toml b/nft/Cargo.toml
index 6cbf5d703..4e0d6901c 100644
--- a/nft/Cargo.toml
+++ b/nft/Cargo.toml
@@ -8,18 +8,18 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
index 982a9a22f..2cdef85b7 100644
--- a/oracle/Cargo.toml
+++ b/oracle/Cargo.toml
@@ -8,22 +8,22 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", 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.22", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml
index ce065b9bd..3bed45713 100644
--- a/oracle/rpc/Cargo.toml
+++ b/oracle/rpc/Cargo.toml
@@ -10,8 +10,8 @@ description = "RPC module for orml-oracle."
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 jsonrpsee = { version = "0.13.0", features = ["server", "macros"] }
 
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 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 2018e1ddd..5be5c07d1 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 = "3.0.0", default-features = false, features = ["derive"] }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/payments/Cargo.toml b/payments/Cargo.toml
index 23530ae41..1f05d5e39 100644
--- a/payments/Cargo.toml
+++ b/payments/Cargo.toml
@@ -12,17 +12,17 @@ readme = "README.md"
 [dependencies]
 parity-scale-codec = { version = "3.1.2", default-features = false, features = ["max-encoded-len"] }
 log = { version = "0.4.17", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 orml-traits = {path = "../traits", version = "0.4.1-dev", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 serde = { version = "1.0.136" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 orml-tokens = { path = "../tokens", version = "0.4.1-dev", default-features = false }
 
 [features]
diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml
index 8874d7d4a..d364ece2b 100644
--- a/rewards/Cargo.toml
+++ b/rewards/Cargo.toml
@@ -8,19 +8,19 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", 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.22" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 7efab9b68..f25e1b1e4 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -8,20 +8,20 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-support = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-support = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", 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.22" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml
index 096095dcf..6403a15e0 100644
--- a/tokens/rpc/Cargo.toml
+++ b/tokens/rpc/Cargo.toml
@@ -10,11 +10,11 @@ edition = "2021"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 jsonrpsee = { version = "0.13.0", features = ["server", "macros"] }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 orml-tokens-rpc-runtime-api = { version = "0.4.1-dev", path = "./runtime-api" }
diff --git a/tokens/rpc/runtime-api/Cargo.toml b/tokens/rpc/runtime-api/Cargo.toml
index 4fc1b3ef9..66e0c106f 100644
--- a/tokens/rpc/runtime-api/Cargo.toml
+++ b/tokens/rpc/runtime-api/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 orml-tokens = { default-features = false, path = "../../../tokens" }
 
 [features]
diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
index 7be814521..be4caccff 100644
--- a/tokens/src/mock.rs
+++ b/tokens/src/mock.rs
@@ -221,7 +221,7 @@ parameter_type_with_key! {
 }
 
 parameter_types! {
-	pub DustReceiver: AccountId = PalletId(*b"orml/dst").into_account();
+	pub DustReceiver: AccountId = PalletId(*b"orml/dst").into_account_truncating();
 }
 
 impl Config for Runtime {
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index 33614dbbc..e9180adb9 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -8,17 +8,17 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 num-traits = { version = "0.2.14", default-features = false }
 impl-trait-for-tuples = "0.2.2"
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", 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.22", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/traits/src/nft.rs b/traits/src/nft.rs
index 9be0754f8..a333dcbbc 100644
--- a/traits/src/nft.rs
+++ b/traits/src/nft.rs
@@ -12,5 +12,5 @@ pub trait InspectExtended<AccountId>: Inspect<AccountId> {
 	fn balance(who: &AccountId) -> Self::Balance;
 
 	/// Get the next token ID to be minted for a Class
-	fn next_token_id(class: Self::ClassId) -> Self::InstanceId;
+	fn next_token_id(class: Self::CollectionId) -> Self::ItemId;
 }
diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml
index c1a933042..b0dfc297d 100644
--- a/unknown-tokens/Cargo.toml
+++ b/unknown-tokens/Cargo.toml
@@ -8,21 +8,21 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", 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.22" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
index f2b7f1e97..62692c421 100644
--- a/utilities/Cargo.toml
+++ b/utilities/Cargo.toml
@@ -8,17 +8,17 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.64"
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml
index 3f12d2d12..d3f4c34d1 100644
--- a/vesting/Cargo.toml
+++ b/vesting/Cargo.toml
@@ -8,19 +8,19 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml
index 3f01a7f9d..ac29937dc 100644
--- a/weight-meter/Cargo.toml
+++ b/weight-meter/Cargo.toml
@@ -9,20 +9,20 @@ edition = "2021"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 weight-meter-procedural = { path = "weight-meter-procedural", default-features = false }
 
 [dev-dependencies]
 serde = { version = "1.0.136" }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22"}
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23"}
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml
index 074c6d2e9..ee972e6d3 100644
--- a/xcm-support/Cargo.toml
+++ b/xcm-support/Cargo.toml
@@ -10,13 +10,13 @@ edition = "2021"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
 
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml
index 7ea8dac72..0f31ac655 100644
--- a/xcm/Cargo.toml
+++ b/xcm/Cargo.toml
@@ -9,17 +9,17 @@ edition = "2021"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
 
 [dev-dependencies]
-xcm-executor  = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
+xcm-executor  = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
 
 [features]
 default = ["std"]
diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml
index 5214ea674..4bc22d995 100644
--- a/xtokens/Cargo.toml
+++ b/xtokens/Cargo.toml
@@ -8,43 +8,43 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false }
 
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false }
 
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", 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.22" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
 
 # cumulus
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" }
 
 # polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" }
-xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"}
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" }
+xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23"}
 
 orml-tokens = { path = "../tokens" }
 orml-xcm = { path = "../xcm" }
diff --git a/xtokens/src/tests.rs b/xtokens/src/tests.rs
index 66183e838..35d78fff8 100644
--- a/xtokens/src/tests.rs
+++ b/xtokens/src/tests.rs
@@ -6,40 +6,36 @@ use cumulus_primitives_core::ParaId;
 use frame_support::{assert_err, assert_noop, assert_ok, traits::Currency};
 use mock::*;
 use orml_traits::{ConcreteFungibleAsset, MultiCurrency};
-use polkadot_parachain::primitives::{AccountIdConversion, Sibling};
-use sp_runtime::AccountId32;
+use polkadot_parachain::primitives::Sibling;
+use sp_runtime::{traits::AccountIdConversion, AccountId32};
 use xcm_simulator::TestExt;
 
 fn para_a_account() -> AccountId32 {
-	ParaId::from(1).into_account()
+	ParaId::from(1).into_account_truncating()
 }
 
 fn para_b_account() -> AccountId32 {
-	ParaId::from(2).into_account()
+	ParaId::from(2).into_account_truncating()
 }
 
 fn para_d_account() -> AccountId32 {
-	ParaId::from(4).into_account()
+	ParaId::from(4).into_account_truncating()
 }
 
 fn sibling_a_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(1).into_account()
+	Sibling::from(1).into_account_truncating()
 }
 
 fn sibling_b_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(2).into_account()
+	Sibling::from(2).into_account_truncating()
 }
 
 fn sibling_c_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(3).into_account()
+	Sibling::from(3).into_account_truncating()
 }
 
 fn sibling_d_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(4).into_account()
+	Sibling::from(4).into_account_truncating()
 }
 
 // Not used in any unit tests, but it's super helpful for debugging. Let's