Merge "Distinguish discontinuities w/ a format change from those without."