Moved HttpRequestFactory logic into Server
Merge branch '1.8.1'