Fix stack overflow exception
keep that keepAlive
cleanup
Update to v1.1.7 - fix SOF
Merge branch 'stackoverflow'

Merge stackoverflow fix