[DAVAF-2157] - Code Review.