Merge "changes in Propertydata model"