Merge pull request #854 from anilgooru/dev-branch

Fixed Disconnect issue.
Fixed. Issue with collection id change.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: