KRACOEUS-7397
Merge pull request #522 from sasipolus/KRACOEUS-7397

KRACOEUS-7397