Merge branch 'br/http-init-fix' into jch