Merge branch 'float-pc' into 1604_ref_port_fl1391