KRACOEUS-7065 moving some coi code into coi