backport: Merge bitcoin#24434, 23136 #1119

Job	Run time
Build Image	3m 55s
Build Dependencies (arm-linux, arm-linux-gnueabihf)	1m 3s
Build Dependencies (linux64, x86_64-pc-linux-gnu)	1m 11s
Build (arm-linux, arm-linux-gnueabihf, arm-linux)	4m 21s
Build (linux64, x86_64-pc-linux-gnu, linux64)	6m 11s
Build (linux64_tsan, x86_64-pc-linux-gnu, linux64)	11m 28s
Build (linux64_ubsan, x86_64-pc-linux-gnu, linux64)	7m 35s
Build (linux64_fuzz, x86_64-pc-linux-gnu, linux64)	14m 49s
Build (linux64_cxx20, x86_64-pc-linux-gnu, linux64)	6m 59s
Build (linux64_sqlite, x86_64-pc-linux-gnu, linux64)	6m 46s
Build (linux64_nowallet, x86_64-pc-linux-gnu, linux64)	6m 51s
	1h 11m 9s

Provide feedback