Merge pull request #1087 from dell/usr/saksham/issue_1080