Added support to connection state
Merge branch 'release/1.3'