Merge branch 'nh/http'