Merge "API council feedback: hide and document." into nyc-dev