Merge "correct up eventTime" into main