KRACOEUS-8480 : Code review comments