[DF-3629] - Code Review.