KRACOEUS-8457: sprint 10
Merge pull request #1208 from leoherbie/KRACOEUS-8457

KRACOEUS-8457: sprint 10