Merge remote-tracking branch 'origin/main' into 984-omasa-ext-output-for-non-disc-modes