Fix keep-alive
Fix ab keep-alive not working
Merge branch 'fix/ab-keepalive' into dev