Co-authored-by: dhruv <856960+dhruv@users.noreply.github.com>
This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/26153 | core#26153]]
https://github.com/bitcoin/bitcoin/pull/26153/commits/12ff72476ac0dbf8add736ad3fb5fad2eeab156c
Depends on D18818