Merge branch 'main' into 808-jbm-mc-bitrate-switching-broken