Merge "Fix encoder failure in segmentation mode" into nextgenv2