Merge branch 'http-fixes' into 'develop'