[DF-3542] - Code Review.