Merge remote-tracking branch 'origin/main' into 544-automatic-tests-missing-for-external-combined-rotations
