Reviewer hint: review with
`git diff --color-moved=dimmed-zebra --ignore-all-space`
This is a backport of [[https://github.com/bitcoin/bitcoin/pull/21236 | core#21236]] [3/6]
https://github.com/bitcoin/bitcoin/pull/21236/commits/ad719297f2ecdd2394eff668b3be7070bc9cb3e2
Depends on D10916