Merge pull request #3483 from alexavator/bugfix-keepalive