Merge "Add support for product_available and vendor_available flags." into main