"fixed alignment issues"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #2003 from suryanarayanakb/dev-branch

Fixed alignment issues