Merge remote-tracking branch 'origin/main' into 115-bitrate-switching-in-ism-rev1