Partial backport of Core [[https://github.com/bitcoin/bitcoin/pull/14454 | PR14454]]
https://github.com/bitcoin/bitcoin/pull/14454/commits/f6ed748cf045d7f0d9a49e15cc0c0001610b9231
https://github.com/bitcoin/bitcoin/pull/14454/commits/c11875c5908a17314bb38caa911507dc6401ec49#diff-3dfbfa462305488434b8d8da81f99de7R99-R111