Defect fixes

2572, 2713
Merge remote-tracking branch 'origin/Saumya'