Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev