Merge "Fix duplicate eventlogtags warnings" into nyc-dev