keepalive (copy from keep_forward)
Merge branch 'keepalive'
0.3.0