KRACOEUS-7022: partial work