Merge remote-tracking branch 'origin/main' into 863-omasa-redundancies-in-stereo-mode-selection