This is a backport of [[https://github.com/bitcoin/bitcoin/pull/19521 | core#19521]] [11/17] and [[https://github.com/bitcoin/bitcoin/pull/22047 | core#22047]] [2/3]
https://github.com/bitcoin/bitcoin/pull/19521/commits/2501576eccb08af80471c7b7b843b189ad6758c0
https://github.com/bitcoin/bitcoin/pull/22047/commits/fb65dde147f63422c4148b089c2f5be0bf5ba80f
Depends on D11604