merge sensor calibration and test updates