Merge "TIF: Address API review comments" into nyc-dev