[OE-3938] fix for crash on live due to missing event_id property in array returned by the api.
Merge branch 'master' into develop