[DF-2899] - code review.