IssueID #4444 - update EventID 630
Update EventID 642