[DF-4805] - Code Review.