Merge pull request #2613 from wvanlint/batch_funding_fix_up