Default KeepAliveInterval to 10.0 seconds
Merge remote-tracking branch 'origin/single-threaded' into single-threaded