merge queue: embarking main (d28386c) and [#8024 + #8034] together #443

Job	Run time
Build CI Docker / Build images	11m 18s
Test with fake activation heights	8m 7s
Test integration with lightwalletd	11m 1s
Test all	7m 55s
Test checkpoint sync from empty state	10m 59s
Test CI testnet Docker config file / Test testnet-conf in Docker	2m 46s
Test CI custom Docker config file / Test custom-conf in Docker	1m 19s
Test CI default Docker config file / Test default-conf in Docker	2m 19s
Open or update issues for main branch failures	0s
	55m 44s

Provide feedback