Merge "Don't set default SF config in proxy"