Merge "Api review." into nyc-dev