Merge "Guard against empty extraInfo" into nyc-dev