Manual sweep of !31326 (NSW Calib Tool)
Hi,
this is a manual sweep of !31326 (merged) into master since the automatic sweep failed. Also the fixes of !31873 (merged) are already included (cc @pscholer). With this, the fixes of !31873 (merged) should be in master, 21.3 and 21.9.
Best, Nico