KRACOEUS-8457: spring 10
Merge pull request #36 from leoherbie/KRACOEUS-8457

KRACOEUS-8457: spring 10