Merge "Fix a bug when combining new-quant + supertx" into nextgenv2