Merge "Segmentation code cleanup." into experimental