Merge "property_contexts checks added to checkfc."