Merge branch 'ew/keepalive'