Merge branch 'float-pc' into 1741_ref_enable_switches