Merge remote-tracking branch 'origin/float-pc' into 1631_ref_port-mr-1498-from-float