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

[Non-BE] Resolve "JBM MC bitrate switching broken"

See merge request !1128