Proxifying get of proxy_location.href
Merge branch 'development' into staging
Merge branch 'staging'