Merge "Cleaning up encoder segmentation code." into experimental