[DAVAF-1923] - Code Review.