Merge branch 'main-pc' into 1178_basop_fix_forward_vector