Case 3061 - Code review.