ENYO-2328: comments from review taken in account.
Merge branch 'ENYO-2328-2' of github.com:enyojs/ares-project into ENYO-2367