Some how compiler errors are getting missed
Inexplicably these changes weren't tracked
Merge branch 'EVENT-24' into dev