merge queue: embarking main (85a59cf) and #3974 together #1336

Job	Run time
check-packages	6m 39s
changelog	0s
build-binaries	10m 33s
build-wasm (wasm, build-wasm-scripts, wasm/tx_.wasm wasm/vp_.wasm wasm/checksums.json )	4m 23s
build-wasm (wasm-for-tests, build-wasm-tests-scripts, wasm_for_tests/*.wasm)	3m 51s
lints	5m 33s
rust-docs	6m 17s
test-unit	11m 33s
test-integration	22m 1s
check-benchmarks	10m 34s
test-wasm	6m 57s
test-e2e-with-device-automation	9m 22s
test-e2e (0)	22m 34s
test-e2e (1)	20m 56s
test-e2e (2)	22m 28s
test-e2e (3)	22m 24s
test-e2e (4)	18m 16s
upload-coverage	14s
	3h 24m 35s

Provide feedback