Merge "Add input flags for event verification" into main