merge: from stawel
fix: calibration verify.