KRACOEUS-7389

Committed the changes