Merge branch 'media-proxy-safety' into 'develop'