KRACOEUS-7847 and KRACOEUS-7282
Merge pull request #845 from shojmr/KRACOEUS-7847

KRACOEUS-7847 and KRACOEUS-7282