Merge "Adds endVariant to the event parser" into main