This is a backport of [[https://github.com/bitcoin/bitcoin/pull/21328 | core#21328]] [2/3] and [[https://github.com/bitcoin/bitcoin/pull/21488 | core#21488]] (unit tests)
https://github.com/bitcoin/bitcoin/pull/21328/commits/2875a764f7d8b1503c7bdb2f262964f7a0cb5fc3
Depends on D11077 and D11081