Merge "Fix build" into nyc-dev