Merge "Add product_available" into main