Merge "Fix ParserEventLog" into main