ENYO-2795: PR remarks treatment.