KRACOEUS-8614: sprint 12