features/channel_page #2

Open
astria wants to merge 3 commits from features/channel_page into developpement