Gauri

Merge from Gauri to sprint 3 branch