Change Details

This is a backport of [[https://github.com/bitcoin/bitcoin/pull/17428 | core#17428]] [2/7] https://github.com/bitcoin/bitcoin/pull/17428/commits/c29272a157d09a8125788c1b860e89b63b4cb36c

This is a backport of [[https://github.com/bitcoin/bitcoin/pull/17428 | core#17428]] [2/7] https://github.com/bitcoin/bitcoin/pull/17428/commits/c29272a157d09a8125788c1b860e89b63b4cb36c Depends on D10507