Merge "Use setChannelId instead of setChannel"