KRACOEUS-7828

- Code updates to fix KRACOEUS-7828