- Merge required changes for message channel types from #221