BugId:94830, BugId:94831 code review