Fix memory leak
Merge branch 'feature/keep-alive' into dev