Merge "Fix a unused function warning with var_tx on" into nextgenv2