KRACOEUS-7598: code review comments