ENYO-2316: I missed this modification
. ENYO-2315 integration