Merge `master` -> `feat/unified` #6156

Job	Run time
Contracts / Test Coverage	10m 26s
Contracts / Wasm tests	14m 13s
Contracts / Rust tests	4m 58s
Contracts / Clippy linter check	1m 4s
	30m 41s

Provide feedback