backport: Merge bitcoin#23123 #424

Job	Run time
Build Image	30s
Build Dependencies (arm-linux, arm-linux-gnueabihf)	58s
Build Dependencies (linux64, x86_64-pc-linux-gnu)	58s
Build Dependencies (linux64_tsan, x86_64-pc-linux-gnu)	59s
Build Dependencies (linux64_ubsan, x86_64-pc-linux-gnu)	1m 2s
Build Dependencies (linux64_fuzz, x86_64-pc-linux-gnu)	58s
Build Dependencies (linux64_cxx20, x86_64-pc-linux-gnu)	1m 0s
Build Dependencies (linux64_sqlite, x86_64-pc-linux-gnu)	1m 4s
Build Dependencies (linux64_nowallet, x86_64-pc-linux-gnu)	1m 0s
Build (arm-linux, arm-linux-gnueabihf)	6m 46s
Build (linux64, x86_64-pc-linux-gnu)	19m 39s
Build (linux64_tsan, x86_64-pc-linux-gnu)	22m 40s
Build (linux64_ubsan, x86_64-pc-linux-gnu)	23m 15s
Build (linux64_fuzz, x86_64-pc-linux-gnu)	14m 26s
Build (linux64_cxx20, x86_64-pc-linux-gnu)	19m 25s
Build (linux64_sqlite, x86_64-pc-linux-gnu)	20m 9s
Build (linux64_nowallet, x86_64-pc-linux-gnu)	20m 7s
	2h 34m 56s

Provide feedback