Merge branch 'main' into 691-osba-crash-for-stereo-output-2