Merge "Docs/API fixes for API review" into nyc-dev