ENYO-2821: PR remarks teatment.