Merge pull request #2746 from TheBlueMatt/2023-11-bitcoin-0.30-followups