Merge branch 'cb/http-test'