Merge "Fix for the invalid Global Proxy Setting" into klp-dev