Merge pull request #3029 from TheBlueMatt/2024-04-fix-batch-funding-failures