Gauri

Merge Gauri to Sprint 4 branch