This is a backport of [[https://github.com/bitcoin/bitcoin/pull/15454 | [[https://github.com/bitcoin/bitcoin/pull/15454 | core#15454]]]] [2/2]
https://github.com/bitcoin/bitcoin/pull/15454/commits/d26f0648f1c0d1115dcb8d76e57195032b88f400
Depends on D10243