This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/22937 | core#22937]] [2f/2g]
https://github.com/bitcoin/bitcoin/pull/22937/commits/6544ea5035268025207d2402db2f7d90fde947a6
The backport for this commit was split in to multiple commits to make review easier.
Depends on D10799