Merge remote-tracking branch 'origin/ivas-float-update' into 1664_ref_portFlp1685