KRACOEUS-8614: sprint 12
Merge pull request #1364 from leoherbie/KRACOEUS-8614

KRACOEUS-8614: sprint 12