Pushed new branch T25224-SpacingCalibration.
Was already merged to the master together with T24287, closing this bug.