ENYO-3082: added FIXME comments