Merge "New protocol for property_service"