Merge pull request #1121 from dell/usr/sapana/ECS02C-1197