Merge "Add "product_available" to product available modules"