Daily cherry pick#25

josibake merged 2 commits into

2140-dev:master2140-dev/bitcoin:masterfrom

rustaceanrob:26-5-19-cprustaceanrob/bitcoin:26-5-19-cpCopy head branch name to clipboard