[DF-4297] - Code Review.