Merge "A fix in optimize_b for new-quant" into nextgenv2