Merging fix into master for joining multiple channels