IDE-1209

Source review.