Merge pull request #950 from anilgooru/dev-branch

Enabled console logs.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: