Merge pull request #2531 from optout21/channel-id-breaking