Merge branch 'calibration' into dev