Merge branch 'float-pc' into 1586_ref_PortFlpMR1386