Merge "Make fmq product_available" into main