Merge from upstream
Http Module branch