Merge remote-tracking branch 'origin/float-pc' into 1314-ref-port-mr1273