KC7517


- Fixed KRACOEUS-7517 it was blocked earlier by KRACOEUS-7529.