Merge branch 'main-pc' into 1484_basop_encoder_crash_in_bw_switching