Stared work on ChannelSettingViewer
Merge