Merge "Fix cleanspec for property_contexts"