Include calibration data in the bag files.
Fix merge.