Fixed fault #3. Pending approval by SQA team
Fixed fault #3. Pending approval by SQA team