Merge "Refine calibrator usage" into main