KRACOEUS-7345
Merge pull request #555 from boneypolus/KRACOEUS-7345

KRACOEUS-7345