Added failsafe measurement-based calibration.