Merge pull request #1062 from dell/ECS02A-779_2