Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'