[#665] Make sure keepalive setting is used for Clients