Merge "Finer granularity discontinuity support." into ics-mr1