Fix issue with recalib within MX-calibrate
Merge remote-tracking branch 'upstream/master'