HttpClient
Merge branch 'http-client' into develop