merge queue: embarking main (92f4732) and [#7753 + #7773] together #130

Job	Run time
Build CI Docker / Build images	10m 57s
Test all	7m 46s
Test checkpoint sync from empty state	18m 55s
Test integration with lightwalletd	20m 34s
Test with fake activation heights	13m 54s
Test CI testnet Docker config file / Test testnet-conf in Docker	3m 16s
Test CI default Docker config file / Test default-conf in Docker	2m 36s
Test CI custom Docker config file / Test custom-conf in Docker	1m 25s
Open or update issues for main branch failures	0s
	1h 19m 23s

Provide feedback