More progress on speed calibration.
Merge origin/master