Merge remote-tracking branch 'origin/main' into 1352-harmonize-output-scaling-in-combined-formats