Merge "Fix resampling logic for duplicate events."