ENYO-2434: As per Yves's request