Merge "Clarified documentation as requested by API review" into nyc-dev