https://enyojs.atlassian.net/browse/ENYO-3627 and f2e068a10fafc300a2b68c22d870474781cdca76