KRACOEUS-7258 : Code review changes