Merge pull request #2486 from wvanlint/batch_channel_opens