Merge branch 'http-api-tests'
Merge branch 'master' into http-api-tests