Merge pull request #1126 from dell/usr/sapana/ECS02C-1202