Merge "A bug fix for var-tx" into nextgenv2