Merge "Minimize property_contexts"