[DF-2997] - Code Review.