httpclient proxy fix
Merge branch 'hotfix_plus_new_api' into dev