merge queue: embarking main (521511f), #3757 and #3735 together #758

Job	Run time
lints	5m 29s
build-wasm (wasm, build-wasm-scripts, wasm/tx_.wasm wasm/vp_.wasm wasm/checksums.json )	4m 28s
rust-docs	5m 49s
build-wasm (wasm-for-tests, build-wasm-tests-scripts, wasm_for_tests/*.wasm)	3m 10s
build-binaries	10m 14s
changelog	0s
check-packages	5m 1s
test-wasm	6m 57s
test-unit	10m 3s
check-benchmarks	9m 49s
test-integration	14m 31s
test-e2e (0)	21m 55s
test-e2e (1)	17m 33s
test-e2e (2)	23m 0s
test-e2e (3)	17m 40s
test-e2e (4)	17m 26s
upload-coverage	9s
	2h 53m 14s

Provide feedback