Merge "Fix uninitialized blk_skip for VAR TX." into nextgenv2