Merge branch 'float-pc' into '1746_ref_port_fl1489'