Merge remote-tracking branch 'origin/float-pc' into 1640_ref_port-mr-1347-from-float