LUN-1548 : fix image event tracking not saving the first time
Merge pull request #37 from pbs/LUN-1548

Lun 1548