Co-authored-by: Alfonso Roman Zubeldia <alfonsoromanz24@gmail.com>
This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/30267 | core#30267]]
https://github.com/bitcoin/bitcoin/pull/30267/commits/80315c011863d69e7785673283e4c9033fbcd5ac