This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/25704 | core#25704]] and [[https://github.com/bitcoin/bitcoin/pull/26477 | core#26477]]
https://github.com/bitcoin/bitcoin/pull/25704/commits/faf44876db555f7488c8df96db9fa88b793f897c
https://github.com/bitcoin/bitcoin/pull/26477/commits/a451e832b46bcb984dfcd9478ea8ebb8b3de0c62
Depends on D15809