Merge pull request #1992 from suryanarayanakb/dev-branch

Alignment issue fixed
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch