Merge branch 'main-pc' into 1571_basop_fix_diffs_between_framesizes