This is a backport of [[https://github.com/bitcoin/bitcoin/pull/23157 | core#23157]] [1 & 2/8]
https://github.com/bitcoin/bitcoin/pull/23157/commits/cb1407196fba648aa75504e3ab3d46aa0181563a
https://github.com/bitcoin/bitcoin/pull/23157/commits/30e240f65e69c6dffcd033afc63895345bd51f53