Merge branch 'main-pc' into 1552_basop_sba_msan_fix