Committed the fix to the defects mentioned in the mail.