Merge "http server/client management"