merge queue: embarking main (e95a70d) and #8413 together #1355

Job	Run time
Build CI Docker / Build images	11m 26s
Test all	22m 39s
Test integration with lightwalletd	12m 21s
Test with fake activation heights	9m 34s
Test checkpoint sync from empty state	12m 59s
Test CI default Docker config file / Test default-conf in Docker	2m 22s
Test CI testnet Docker config file / Test testnet-conf in Docker	2m 22s
Test CI custom Docker config file / Test custom-conf in Docker	1m 18s
Open or update issues for main branch failures	0s
	1h 15m 1s

Provide feedback