KRACOEUS-6294: code review comments