proxy server updates
Merge branch 'proxyUpdate' into dev