This concludes backport of [[https://github.com/bitcoin/bitcoin/pull/20744 | core#20744]]
https://github.com/bitcoin/bitcoin/pull/20744/commits/b87f9c5edf3895df9650131fcf8551c3ad1d7301
https://github.com/bitcoin/bitcoin/pull/20744/commits/07269321f38e46e9e02f16d7cd135ea90692638d
Depends on D11974