Merge remote-tracking branch 'origin/float-pc' into 1607_ref_port-mr-1401-from-float