Issue tracked within https://enyojs.atlassian.net/browse/ENYO-2999.