[DF-4498] - Code Review.