diff --git a/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm b/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm
index ef38f451ca912..0ab058e8ed732 100644
Binary files a/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm and b/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm differ
diff --git a/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm b/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm
index 06bc618acd1da..8887b0a3ab25d 100755
Binary files a/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm and b/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm differ
diff --git a/polkadot/parachain/test-chains/basic_add/src/lib.rs b/polkadot/parachain/test-chains/basic_add/src/lib.rs
index 723efb307f330..7518072a1dda6 100644
--- a/polkadot/parachain/test-chains/basic_add/src/lib.rs
+++ b/polkadot/parachain/test-chains/basic_add/src/lib.rs
@@ -17,7 +17,13 @@
 //! Basic parachain that adds a number as part of its state.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(not(feature = "std"), feature(alloc, core_intrinsics, lang_items, panic_implementation, core_panic_info))]
+#![cfg_attr(
+	not(feature = "std"),
+	feature(
+		alloc, core_intrinsics, lang_items, panic_implementation, core_panic_info,
+		alloc_error_handler
+	)
+)]
 
 #[cfg(not(feature = "std"))]
 extern crate alloc;
diff --git a/polkadot/parachain/test-chains/basic_add/src/wasm.rs b/polkadot/parachain/test-chains/basic_add/src/wasm.rs
index edf53dc46f68a..38a8aa81b5cb2 100644
--- a/polkadot/parachain/test-chains/basic_add/src/wasm.rs
+++ b/polkadot/parachain/test-chains/basic_add/src/wasm.rs
@@ -16,7 +16,7 @@
 
 //! Defines WASM module logic.
 
-use core::{intrinsics, panic};
+use core::{intrinsics, panic, alloc};
 use parachain::{self, ValidationResult};
 use parachain::codec::Slicable;
 use super::{HeadData, BlockData};
@@ -29,9 +29,9 @@ pub fn panic(_info: &panic::PanicInfo) -> ! {
 	}
 }
 
-#[lang = "oom"]
+#[alloc_error_handler]
 #[no_mangle]
-pub fn oom() -> ! {
+pub fn oom(_: alloc::Layout) -> ! {
 	unsafe {
 		intrinsics::abort();
 	}
diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
index 31556cad32339..b81c6f912785f 100644
Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm differ
diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
index 7d10ac489dfb4..4430bf8545f65 100755
Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm differ
diff --git a/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm b/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm
index 8caad8964a3bb..c098995d42740 100644
Binary files a/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm and b/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm differ
diff --git a/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm b/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm
index 23480a619993d..11fb0a7073966 100755
Binary files a/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm and b/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm differ
diff --git a/substrate/runtime-io/src/lib.rs b/substrate/runtime-io/src/lib.rs
index b3373fb46dc09..9d57f537f73d8 100644
--- a/substrate/runtime-io/src/lib.rs
+++ b/substrate/runtime-io/src/lib.rs
@@ -19,6 +19,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(not(feature = "std"), feature(lang_items))]
 #![cfg_attr(not(feature = "std"), feature(panic_implementation))]
+#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
 #![cfg_attr(not(feature = "std"), feature(alloc))]
 
diff --git a/substrate/runtime-io/without_std.rs b/substrate/runtime-io/without_std.rs
index 272f2fc04f5e1..e1dd22c577f25 100644
--- a/substrate/runtime-io/without_std.rs
+++ b/substrate/runtime-io/without_std.rs
@@ -40,8 +40,8 @@ pub fn panic(info: &::core::panic::PanicInfo) -> ! {
 	}
 }
 
-#[lang = "oom"]
-pub extern fn oom() -> ! {
+#[alloc_error_handler]
+pub extern fn oom(_: ::core::alloc::Layout) -> ! {
     static OOM_MSG: &str = "Runtime memory exhausted. Aborting";
 
 	unsafe {
diff --git a/substrate/runtime/system/src/lib.rs b/substrate/runtime/system/src/lib.rs
index 182a1a0aa5f6e..e0c0f94a654d9 100644
--- a/substrate/runtime/system/src/lib.rs
+++ b/substrate/runtime/system/src/lib.rs
@@ -72,7 +72,6 @@ pub trait Trait: Eq + Clone {
 	type Header: Parameter + traits::Header<
 		Number = Self::BlockNumber,
 		Hash = Self::Hash,
-		Hash = Self::Hash,
 		Digest = Self::Digest
 	>;
 }
diff --git a/substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm b/substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
index 17284d56cd7e8..cc2e8a03c3265 100644
Binary files a/substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm and b/substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm differ
diff --git a/substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.wasm b/substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.wasm
index 4c6330bb97700..dc9dffdade813 100755
Binary files a/substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.wasm and b/substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.wasm differ