Merge "Quantization fix for new-quant/var-tx" into nextgenv2