KRACOEUS-7120: more code review changes