KRACOEUS-7398

Committed the code.