Partial backport (5/6) of core PR18698: https://github.com/bitcoin/bitcoin/pull/18698/commits/fa1d97b25686a5caca623599f6d608fd08616fe8
Depends on D8563.
ninja all check-all