[DF-4780] - Code Review.