Merge "Handle API review comments from the council." into nyc-dev