Merge calibration additions into Lawrence's Master