Merge "Ignore resampled values when computing velocity"