backport: Merge bitcoin#25786,25512 #1924

Job	Run time
Build container / Build container	22s
x86_64-pc-linux-gnu_multiprocess / Build depends	1m 8s
x86_64-pc-linux-gnu_nowallet / Build depends	1m 6s
x86_64-w64-mingw32 / Build depends	58s
x86_64-apple-darwin / Build depends	1m 3s
x86_64-pc-linux-gnu / Build depends	1m 7s
arm-linux-gnueabihf / Build depends	57s
arm-linux-build / Build source	1m 51s
win64-build / Build source	3m 6s
mac-build / Build source	3m 23s
linux64_nowallet-build / Build source	2m 26s
linux64-build / Build source	2m 27s
linux64_sqlite-build / Build source	2m 15s
linux64_fuzz-build / Build source	10m 36s
linux64_ubsan-build / Build source	2m 53s
linux64_tsan-build / Build source	3m 1s
linux64_multiprocess-build / Build source	2m 51s
linux64_sqlite-test	0s
linux64_nowallet-test	0s
linux64-test	0s
linux64_ubsan-test	0s
	41m 30s

Provide feedback