Merge "Further changes to new-quant tables" into nextgenv2