[DAVAF-1920] - Code Review.