merge queue: embarking main (bd686dc), #3735 and #3715 together #761

Job	Run time
build-wasm (wasm, build-wasm-scripts, wasm/tx_.wasm wasm/vp_.wasm wasm/checksums.json )	4m 22s
build-wasm (wasm-for-tests, build-wasm-tests-scripts, wasm_for_tests/*.wasm)	4m 14s
check-packages	7m 27s
build-binaries	9m 32s
changelog	0s
lints	7m 4s
rust-docs	8m 2s
test-unit	10m 24s
test-wasm	7m 40s
test-integration	15m 55s
check-benchmarks	11m 5s
test-e2e (0)	23m 40s
test-e2e (1)	18m 41s
test-e2e (2)	23m 8s
test-e2e (3)	19m 41s
test-e2e (4)	18m 57s
upload-coverage	8s
	3h 10m 0s

Provide feedback