Merge remote-tracking branch 'remotes/origin/main' into 808-jbm-mc-bitrate-switching-broken