KRACOEUS-7991 : Code review changes