Merge branch 'epic/permissions-open-channels' into 'master'