ENYO-2328: comments from review taken in account.