Case 2607 - Code review.