[DF-4911] - Code Review.