Merge "don't load property_contexts from /data"