More speed calibration.
Merge origin/master