Merge "Revert "Revert "New protocol for property_service"""