Merge "Reset the last corrected timestamp upon discontinuity"