Merge "Remove EventLogTags depdendency" into main