Merge branch 'fix/unstable_calibration' into develop

1 job for develop in 1 minute and 58 seconds (queued for 3 seconds)