Merge "Improve timestamp jitter fix" into nyc-dev