backport: Merge bitcoin#24434, 23136 #1123

Job	Run time
Build Image	3m 50s
Build Dependencies (arm-linux, arm-linux-gnueabihf)	1m 4s
Build Dependencies (linux64, x86_64-pc-linux-gnu)	1m 2s
Build (arm-linux, arm-linux-gnueabihf, arm-linux)	4m 36s
Build (linux64, x86_64-pc-linux-gnu, linux64)	6m 22s
Build (linux64_tsan, x86_64-pc-linux-gnu, linux64)	11m 37s
Build (linux64_ubsan, x86_64-pc-linux-gnu, linux64)	7m 35s
Build (linux64_fuzz, x86_64-pc-linux-gnu, linux64)	15m 18s
Build (linux64_cxx20, x86_64-pc-linux-gnu, linux64)	7m 23s
Build (linux64_sqlite, x86_64-pc-linux-gnu, linux64)	6m 54s
Build (linux64_nowallet, x86_64-pc-linux-gnu, linux64)	7m 11s
	1h 12m 52s

Provide feedback