Merge remote-tracking branch 'origin/float-pc' into 1716_ref_activate_switch