F2961024

F2961024: D25474.1739155188.diff