[DF-2880] - Code Review.