Merge branch 'dm/http-cleanup'