Merge branch 'stg-master' into Saumya
fix to discount
Merge branch 'Saumya' into stg-master