Merge pull request #1122 from dell/usr/sapana/ECS02C-1198