Fix connection case-sensetive check
Merge branch 'feature/keep-alive' into dev