Merge "Remove PROPERTY_ prefix"