This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/30808 | core#30808]] and [[https://github.com/bitcoin/bitcoin/pull/30817 | core#30817]]
https://github.com/bitcoin/bitcoin/pull/30808/commits/a3108a7c5692d137b70b8442b4741936277e89be
https://github.com/bitcoin/bitcoin/pull/30817/commits/c2b779da4e7f1bf1a5c5d67ec94cba3027b42ee7
Depends on D18048