KRACOEUS-8557: sprint 11