Merge "Remove special case handling of "ro." properties"