Manage offline of endpoints
Merge branch 'master' into feature/bounded-pool
Retain older connection for pool
fix #1
Merge branch 'feature/bounded-pool' into develop
fix indent