Merge branch 'update/httpClient'