Merge "Update API" into nyc-dev