Proxy dev

Merge the proxy_dev branch into master