keep alive test
Merge branch 'keep_alive'