Defect Fix for Sprint 1 & 2

Merge from Gauri to sprint 3 branch