Merge pull request #1123 from anilgooru/dev-branch

Bug fixes.
Updated content and fix ui issue.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: