This commit does not change behavior.
Partial backport of core [[https://github.com/bitcoin/bitcoin/pull/14437/files | PR14437:]]:
https://github.com/bitcoin/bitcoin/pull/14437/commits/79d579f4e11b57f90fed314bccd25230f918729f
Depends on D5063 and D5074.