Sushil

Merged Sushil to sprint 3 branch, Upload defect fixes