Case 2796 - Code review.