merge queue: embarking main (c494aa7) and #8533 together #1313

Job	Run time
Generate crates matrix	9s
Check crates matrix	2s
Build zebrad crate	36m 54s
Build zebra-utils crate	18m 41s
Build zebra-test crate	1m 29s
Build zebra-state crate	22m 42s
Build zebra-script crate	4m 44s
Build zebra-scan crate	21m 47s
Build zebra-rpc crate	23m 43s
Build zebra-node-services crate	3m 23s
Build zebra-network crate	6m 56s
Build zebra-grpc crate	15m 8s
Build zebra-consensus crate	19m 21s
Build zebra-chain crate	5m 25s
Build tower-fallback crate	1m 2s
Build tower-batch-control crate	1m 22s
Open or update issues for building crates individually failures	0s
	3h 2m 48s

Provide feedback