Merge "Use an integer for the channel id."