Merge branch 'master' into Saumya
fix 2425
defect 2433
Merge branch 'Saumya'