Merged in refactoring of http-transport