KRACOEUS-7620
Merge pull request #524 from sasipolus/KRACOEUS-7620

KRACOEUS-7620