Merge "Change property_contexts from private to public." into rvc-dev