Merge remote-tracking branch 'origin/float-pc' into 1718_ref_portMR1457