Merge remote-tracking branch 'origin/float-pc' into 1318-ref-port-float-mr1275