ENYO-3240: added comments (Olga, thanks for the explanations)
ENYO-3240: removed unsafe strategyKind setting