Updated as per Bug:30678