ENYO-2485: comment review taken in account