Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'