[DAVAF-1924] - Code Review.