Code

Merge branch 'tc/http-cleanup'