[DF-4690] - Code Review.