Merge "CDD: require timestamps to be accurate to +/- 1 ms" into pi-dev