[DAVAF-1921] - Code Review.