Merge "Fix for the invalid Global Proxy Setting"