Calibration support for 3e785710ef0354eff8876e73c8011d7ae4fa8f33