Merge "Keep backward compatibility for the format of event log"