KRACOEUS-7619
Merge pull request #523 from sasipolus/KRACOEUS-7619

KRACOEUS-7619