Merge branch 'main-pc' into 1741_basop_enable_switches