Co-Authored-By: l0rinc <pap.lorinc@gmail.com>
This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/30611 | core#30611]]
https://github.com/bitcoin/bitcoin/pull/30611/commits/2e2f41068128c38120a5b44d24ee30f71970455a
Depends on D18641