KRACOEUS-8457: sprint 10