[DF-4236] - Code Review.