Merge "Extension of segmentation to 8 segments." into experimental