Merge "Fix API" into nyc-dev