Merge "Fixes for var_tx when ext_tx is not enabled" into nextgenv2