Check if content is proxy and act accordingly
Merge branch 'pull-request/proxy'