Gauri

Merge Gauri branch to sprint 5, defect fixes for sprint 4. Resolved conflicts with rajib branch :(