This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/22674 | core#22674]]
https://github.com/bitcoin/bitcoin/pull/22674/commits/9b2fdca7f03911ac40fe0f8a0b5da534bee4554b
https://github.com/bitcoin/bitcoin/pull/22674/commits/ba26169f6035c238378a3c9647213328a006fa23