merge queue: embarking main (ad015e0) and [#8120 + #8121] together #557

Job	Run time
Generate crates matrix	11s
Check crates matrix	2s
Build zebrad crate	28m 15s
Build zebra-utils crate	17m 42s
Build zebra-test crate	1m 41s
Build zebra-state crate	21m 44s
Build zebra-script crate	4m 28s
Build zebra-scan crate	19m 50s
Build zebra-rpc crate	22m 42s
Build zebra-node-services crate	3m 30s
Build zebra-network crate	7m 7s
Build zebra-consensus crate	17m 42s
Build zebra-chain crate	5m 7s
Build tower-fallback crate	1m 5s
Build tower-batch-control crate	12m 46s
Open or update issues for building crates individually failures	0s
	2h 43m 52s

Provide feedback