Merge "cost_coeff speed improvements" into nextgenv2