Cleaning in service
Merge branch 'reconnect'