Merge "Add vendor_available: true"