This is a backport of [[https://github.com/bitcoin/bitcoin/pull/21767 | core#21767]] [2 & 3 / 5]
https://github.com/bitcoin/bitcoin/pull/21767/commits/91226eb91769aad5a63bc671595e1353a2b2247a
https://github.com/bitcoin/bitcoin/pull/21767/commits/f4a47a1febfa35ab077f2a841fe31a8cd9618250