merge queue: embarking main (4924730) and [#4401 + #4407] together #2391

Job	Run time
rust-docs	5m 37s
build-wasm (wasm, build-wasm-scripts, wasm/tx_.wasm wasm/vp_.wasm wasm/checksums.json )	4m 48s
build-wasm (wasm-for-tests, build-wasm-tests-scripts, wasm_for_tests/*.wasm)	4m 47s
build-binaries	9m 22s
check-packages	4m 12s
lints	4m 55s
changelog	0s
test-ledger-app	9m 11s
test-wasm	7m 19s
test-integration	20m 35s
test-unit	12m 44s
check-benchmarks	9m 25s
test-e2e-with-device-automation	9m 51s
test-e2e (0)	22m 59s
test-e2e (1)	28m 6s
test-e2e (2)	21m 56s
test-e2e (3)	24m 22s
test-e2e (4)	26m 41s
upload-coverage	14s
	3h 47m 4s

Provide feedback