Merge "Addressed the review comments from API Council" into nyc-dev