f7a7a6b Merge branch '367-missing-data-in-events-generated-when-reading-existing-evx-file' into 'master'