Merge branch 'main' into 568-crash-ism-bitrate-switching