Merge "TIF: More annotations" into nyc-dev