Merge "Fix permission issue on channel" into jb-mr1-dev