KRACOEUS-7113

Commited the code.