KRACOEUS-7826

- Code updates to fix KRACOEUS-7826