This is a backport of core#21370 and core#21424[[https://github.com/bitcoin/bitcoin/pull/21370 | core#21370]] and [[https://github.com/bitcoin/bitcoin/pull/21424 | core#21424]] (partial)
https://github.com/bitcoin/bitcoin/pull/21424/commits/6927933782acb9b158787e6f35debb916793f6b1