[DF-4038] - Code Review.