Merge branch 'main-pc' into 1831_basop_predelay_fix