Merge branch 'main' into 256_mc_bitrate_switching_tests