This concludes backport of [[https://github.com/bitcoin/bitcoin/pull/21644 | core#21644]]
https://github.com/bitcoin/bitcoin/pull/21664/commits/e93ac26b8563576345c13e83c777dd39e7616b1e
https://github.com/bitcoin/bitcoin/pull/21664/commits/2aa1631822b2fdbc6cf7a3dcd99adaf4d2745ed4
Depends D13600