[DF-3838] - Code Review.