[stable2412] Backport #6562 #7086

Job	Run time
preflight / preflight	42s
preflight / ci-versions	1m 4s
cargo-check-all-crate-macos	2m 25s
cargo-check-benches (master)	1s
cargo-check-each-crate (1)	1s
cargo-check-benches (current)	1s
test-frame-ui	1s
cargo-check-each-crate (2)	1s
cargo-check-each-crate (3)	1s
cargo-check-each-crate (4)	1s
test-full-crypto-feature	1s
test-node-metrics	1s
cargo-check-each-crate (5)	1s
cargo-check-each-crate (6)	1s
cargo-check-each-crate (7)	1s
node-bench-regression-guard	1s
check-tracing	1s
test-frame-examples-compile-to-wasm	1s
check-metadata-hash	1s
test-deterministic-wasm	1s
All test misc tests passed	1s
	4m 29s

Provide feedback