Merge "Fix typo" into nyc-dev