Merge branch 'hotfix/media-proxy-uri' into 'develop'