Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'