Merge branch 'main' into 1527_fix_bitrate_idx_in_CMR_tests