Defect Fixes

2500
2502
Merge branch 'master' into Saumya
Merge branch 'Saumya'