backport: finish merging 25001 #1519

Job	Run time
Build Image	17s
Build Dependencies (arm-linux, arm-linux-gnueabihf)	1m 18s
Build Dependencies (linux64, x86_64-pc-linux-gnu)	1m 4s
Build (arm-linux, arm-linux-gnueabihf, arm-linux)	19m 29s
Build (linux64, x86_64-pc-linux-gnu, linux64)	16m 42s
Build (linux64_cxx20, x86_64-pc-linux-gnu, linux64)	19m 11s
Build (linux64_fuzz, x86_64-pc-linux-gnu, linux64)	14m 14s
Build (linux64_nowallet, x86_64-pc-linux-gnu, linux64)	19m 16s
Build (linux64_sqlite, x86_64-pc-linux-gnu, linux64)	19m 1s
Build (linux64_tsan, x86_64-pc-linux-gnu, linux64)	25m 24s
Build (linux64_ubsan, x86_64-pc-linux-gnu, linux64)	27m 29s
	2h 43m 25s

Provide feedback