Merge "Support /product partition"