Merge branch 'main' into 869-possible-crash-in-stereo-bitrate-switching