Channel issue is resolved now. You can merge this pull after reviewing.