Please handle that in the scope of https://enyojs.atlassian.net/browse/ENYO-2727