Fix Change channel
Merge branch 'ChangeChannel' into develop