Co-authored-by: Anthony Towns <aj@erisian.com.au>
Suhas Daftuar <sdaftuar@gmail.com>
This is a partial backport of Core [[https://github.com/bitcoin/bitcoin/pull/15141 | PR15141]] : https://github.com/bitcoin/bitcoin/pull/15141/commits/00e11e61c0211a62788611cd6a6714a393fdc26c