follow-up JIRA: ENYO-2733