[DF-3873] - code review.