BugId:95613 - Code review updates