Merge branch 'nh/http' into next