[DF-4769] - Code Review.