Defect fix

Merge from Gauri to Sprint 3 branch