Merge branch 'dt/smart-http-detect-server-going-away'