new connection/session handling
Merge remote-tracking branch 'origin/master'