merge queue: embarking main (0cceb6a) and #8526 together #1535

Job	Run time
Build CI Docker / Build images	10m 41s
Test integration with lightwalletd	12m 20s
Test all	22m 21s
Test with fake activation heights	9m 19s
Test checkpoint sync from empty state	12m 46s
Test CI default Docker config file / Test default-conf in Docker	2m 32s
Test CI custom Docker config file / Test custom-conf in Docker	1m 9s
Test CI testnet Docker config file / Test testnet-conf in Docker	2m 20s
Open or update issues for main branch failures	0s
	1h 13m 28s

Provide feedback