KRACOEUS-7339
Merge pull request #432 from mrudulpolus/KRACOEUS-7339

KRACOEUS-7339