Merge "Separate 2 clip paths into 2 groups" into mnc-dev