https://github.com/bitcoin/bitcoin/pull/16399/commits/3199610ad3b93b849f2cb55a8ed3a39a32bbdffc
note: [[https://github.com/bitcoin/bitcoin/pull/16399/commits/d6649d16b57e20b05075f1c80d0de7ff32cca1a4 | this]] one has already been added in D6425
---
Partial backport of Core [[https://github.com/bitcoin/bitcoin/pull/16399 | PR16399]]