Merge "Fix mac build" into nyc-dev