Merge remote-tracking branch 'origin/float-pc' into 1626_ref+porting-mr-111-port-mr-1433-to-float