[DF-649] - Code Review.