Merge "Patch to remove implicit segmentation." into experimental