KRACOEUS-8181: code review comments