Simplify ch3 messages
Simplify Channel3Protocol
Merge remote-tracking branch 'origin/master'