Merge "Address API council feedback (continued)" into nyc-mr1-dev