Merge branch 'epic/permissions-open-channels' into feat/closed-channels-602