Merge branch 'se/http' into next