Merge pull request #705 from enyojs/ENYO-3082

ENYO-3082: feed review comments from ENYO-3082-2 into ENYO-3082
Merge remote-tracking branch 'origin/ENYO-3082-2'