Rahul - sprint 9 fixes