Merge remote-tracking branch 'origin/float-pc' into 1489_float_port_MR1292