KRACOEUS-7308: code review comments