Sprint 5

Merge Rajib and gauri defect fixes to Master branch