KRACOEUS-6955 : common #258 fix upon comments 3