Merge branch 'bugfix/funkwhale-channel' into 'develop'