Merge pull request #1055 from dell/usr/Monika_Illuri/ECS02A-779