Manual sweep of !39809 (merged) into 21.3 and 21.9 (fix in MDT calib)
See merge request !39810 (merged)