Fixing code for the 500th time?
Merge branch 'EVENT-24' into dev