Merge "Fix equals and hash code methods for the Property class" into main