Gauri

Merge Gauri branch to sprint 5, fixed the sprint 4 issues