Partial backport of Core [[https://github.com/bitcoin/bitcoin/pull/16714 | [[https://github.com/bitcoin/bitcoin/pull/16714 | PR16714]]]] - part 3 of 5
Commit [[https://github.com/bitcoin/bitcoin/pull/16714/commits/1bbc49d2078ee53488e214d00eb47462687b05c5 | 1bbc49d2078ee53488e214d00eb47462687b05c5]]
Depends on D7953