Merge remote-tracking branch 'origin/main-pc' into 1716_basop_activate_switch