Follow-up JIRA is  [ENYO-3626](https://enyojs.atlassian.net/browse/ENYO-3626).