Merge pull request #1120 from dell/usr/sapana/ECS02C-1196