Merge from cob3-3 calibration user