Merge "Fix partition type costing." into nextgenv2