IDEX-762. Update Events Error Messages
Merge branch 'master' into CLDIDE-1930