Merge pull request #1086 from dell/usr/saksham/ECS02C-933