KRACOEUS-7402
Merge pull request #482 from anithapolus/KRACOEUS-7402

KRACOEUS-7402