Add the keepalive attribute to the client
Merge branch 'client_add_keepalive'