Make keep-alive support configurable
Merge branch 'feature/keep-alive' into dev