Commit by imran on the behalf of zahid