merge queue: embarking main (d6f4d31) and #7730 together #98

Job	Run time
Build CI Docker / Build images	11m 19s
Test checkpoint sync from empty state	20m 17s
Test with fake activation heights	18m 29s
Test all	12m 40s
Test all with getblocktemplate-rpcs feature	12m 55s
Test integration with lightwalletd	22m 48s
Test CI default Docker config file / Test default-conf in Docker	3m 0s
Test CI testnet Docker config file / Test testnet-conf in Docker	3m 2s
Test CI custom Docker config file / Test custom-conf in Docker	1m 46s
Open or update issues for main branch failures	0s
	1h 46m 16s

Provide feedback