ENYO-2512: code rearrengement