Merge "Fix slice decrement for skipped slices" into mnc-dev