co-authored-by: Glenn Willen <gwillen@nerdnet.org>
Backport of Core [[https://github.com/bitcoin/bitcoin/pull/17509 | PR17509]] part [4/6] : https://github.com/bitcoin/bitcoin/pull/17509/commits/f6895301f768220f3ea70231d5cc5b45ecbf4488
Depends on D8066