[DF-4519] - Code Review.