Merge pull request #468 from anilgooru/dev-branch

Bugs fixes for 6.3 patch
Pushed just removing space.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: