Encapsulate Channel enum variants inside a struct
#3550
Merged
Channel enum variants inside a struct
#3550