Merge "Further Implicit Segmentation Changes" into experimental