[ENYO-3629](https://enyojs.atlassian.net/browse/ENYO-3629)