merge queue: embarking main (d6b4588) and [#8643 + #8638] together #1471

Job	Run time
Generate crates matrix	9s
Check crates matrix	4s
Build zebrad crate	32m 26s
Build zebra-utils crate	17m 20s
Build zebra-test crate	1m 29s
Build zebra-state crate	23m 13s
Build zebra-script crate	3m 41s
Build zebra-scan crate	21m 26s
Build zebra-rpc crate	22m 24s
Build zebra-node-services crate	3m 14s
Build zebra-network crate	7m 7s
Build zebra-grpc crate	15m 2s
Build zebra-consensus crate	17m 46s
Build zebra-chain crate	4m 57s
Build tower-fallback crate	1m 0s
Build tower-batch-control crate	1m 20s
Open or update issues for building crates individually failures	0s
	2h 52m 38s

Provide feedback