Merge pull request #1125 from dell/usr/sapana/ECS02C-1201