Merge "fix for proxy setup"