Merge "Mark as vendor_available"